diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 40ff413b72..1b551272eb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,14 @@
 # Contributing to World Cleanup Day App and Platform
 
+Not sure how to start? Read on for the general process or [jump right in](GETTING_STARTED.md).
+
+- [Code of Conduct](#code-of-conduct)
+- [How can you contribute?](#how-you-can-contribute)
+- [Issue Contributions](#issue-contributions)
+- [Code Contributions](#code-contributions)
+- [Additional Notes](#additional-notes)
+- [Developer's Certificate of Origin 1.1](#developers-certificate-of-origin-11)
+
 ## Code of Conduct
 
 * We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic.
@@ -13,7 +22,7 @@
 * Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
 * Avoid the use of personal pronouns in code comments or documentation. There is no need to address persons when explaining code (e.g. "When the developer").
 
-## How you can contribute? 
+## How you can contribute?
 Do you like to design?
 
 * Create art for social media banners to promote the project
diff --git a/GETTING_STARTED.md b/GETTING_STARTED.md
new file mode 100644
index 0000000000..9788587a91
--- /dev/null
+++ b/GETTING_STARTED.md
@@ -0,0 +1,38 @@
+# Getting started
+
+This document will help you set up the project for development.
+
+## Basic dependencies
+Install git, docker, docker-compose, node and yarn.
+
+
+## Backend services
+Consult the dedicated [readme](devops/dev/README.md) to set them up, run
+them and verify they work.
+
+### Adding dummy data
+This repository comes without trashpoint data. You will need some to work
+on the related APIS or marker related functionality.
+
+**TODO:** expand with wcd_dummy instructions
+
+
+## Web-app (admin backend)
+Consult the dedicated [readme](web-app/README.md), but in essence:
+
+```bash
+npm install # the first time
+npm start
+```
+
+## Mobile-apps
+Consult the dedicated [readme](mobile-app/README.md).
+
+
+## Extra reading
+
+* [Contributing](./CONTRIBUTING.md) to World Cleanup Day App and Platform
+* [Code of Conduct](./CODE_OF_CONDUCT.md)
+* [Governance](./GOVERNANCE.md)
+* [Roadmap](./ROADMAP.md)
+* Issues marked [good first issue](https://github.com/letsdoitworld/World-Cleanup-Day/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
diff --git a/README.md b/README.md
index 6aeef6126c..1df7204b4d 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 [![Join the chat at https://gitter.im/letsdoitworld/World-Cleanup-Day](https://badges.gitter.im/letsdoitworld/World-Cleanup-Day.svg)](https://gitter.im/letsdoitworld/World-Cleanup-Day?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-Over 17 million trash heroes have already cleaned up more than 500 000 tonnes of trash in over 100 countries! The movement against pollution is growing fast and we're now building the World Cleanup App and Platform for the hundreds of millions of people people joining the World Cleanup Day on **15th of September 2018**. 
+Over 20 million trash heroes have already cleaned up more than 500 000 tonnes of trash in over 100 countries! The movement against pollution is growing fast and we're now building the World Cleanup App and Platform for the hundreds of millions of people people joining the World Cleanup Day on **15th of September 2018**. 
 
 Together we will get rid of trash once and for all, save lives, improve health & reduce costs. Read below on how you can participate! Let's do it! 😃 
 
@@ -43,6 +43,12 @@ Join the movement and let's clean up the World together!
 ## API
 See the [API docs](http://ldiw-api.s3-website.eu-central-1.amazonaws.com/)
 
+## Translations
+See [translate.worldcleanupday.org](https://translate.worldcleanupday.org/ )
+
+## Chat
+Join our [Slack chatroom](https://join.slack.com/t/worldcleanupday/shared_invite/enQtMzM0NDQ0MTE5NDI3LThmYTUxNGRiYmQ2ZGVkODJmMDAwN2U3YWVhMTI2ZmU4ZjBlMzk0YjM2YjU0MjNhNmE4ZWEwNDJkN2U0ZjMyZWY)
+
 ## Roadmap
 See [Roadmap.md](https://github.com/letsdoitworld/World-Cleanup-Day/blob/master/ROADMAP.md)
 
diff --git a/mobile-app/src/components/AlertModal/styles.js b/mobile-app/src/components/AlertModal/styles.js
index ba5a17af80..66ff1a02bb 100644
--- a/mobile-app/src/components/AlertModal/styles.js
+++ b/mobile-app/src/components/AlertModal/styles.js
@@ -4,10 +4,10 @@ import { getHeightPercentage, getWidthPercentage } from '../../shared/helpers';
 export default EStyleSheet.create({
   container: {
     backgroundColor: '$white',
-    marginVertical: getHeightPercentage(178),
+    marginVertical: getHeightPercentage(168),
     marginHorizontal: getWidthPercentage(20),
     borderRadius: 8,
-    height: getHeightPercentage(212),
+    height: getHeightPercentage(232),
     width: getWidthPercentage(280),
     alignItems: 'center',
   },
diff --git a/mobile-app/src/components/PhotoModal/PhotoModal.js b/mobile-app/src/components/PhotoModal/PhotoModal.js
new file mode 100644
index 0000000000..fcc19dcf50
--- /dev/null
+++ b/mobile-app/src/components/PhotoModal/PhotoModal.js
@@ -0,0 +1,47 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  Image,
+  Modal,
+  TouchableOpacity,
+} from 'react-native';
+import { Ionicons } from '@expo/vector-icons';
+
+import styles from './styles';
+
+const PhotoModal = ({ visible, onRequestClose, photoUrl }) => {
+  return (
+    <Modal
+      visible={visible}
+      onRequestClose={onRequestClose}
+      style={styles.modal}
+    >
+      <Image
+        style={{
+          flex: 1,
+        }}
+        resizeMode="contain"
+        source={{ uri: photoUrl }}
+      >
+        <TouchableOpacity
+          onPress={onRequestClose}
+          style={styles.buttonBody}
+        >
+          <Ionicons
+            size={styles.$iconSize}
+            name="md-close"
+            style={styles.buttonIcon}
+          />
+        </TouchableOpacity>
+      </Image>
+    </Modal>
+  );
+};
+
+PhotoModal.propTypes = {
+  visible: PropTypes.bool.isRequired,
+  onRequestClose: PropTypes.func.isRequired,
+  photoUrl: PropTypes.string.isRequired,
+};
+
+export default PhotoModal;
diff --git a/mobile-app/src/components/PhotoModal/index.js b/mobile-app/src/components/PhotoModal/index.js
new file mode 100644
index 0000000000..9bf0046f3b
--- /dev/null
+++ b/mobile-app/src/components/PhotoModal/index.js
@@ -0,0 +1 @@
+export { default as PhotoModal } from './PhotoModal.js';
diff --git a/mobile-app/src/components/PhotoModal/styles.js b/mobile-app/src/components/PhotoModal/styles.js
new file mode 100644
index 0000000000..19247b2e51
--- /dev/null
+++ b/mobile-app/src/components/PhotoModal/styles.js
@@ -0,0 +1,25 @@
+import EStyleSheet from 'react-native-extended-stylesheet';
+import { getHeightPercentage, getWidthPercentage } from '../../shared/helpers';
+
+const styles = EStyleSheet.create({
+  $iconSize: getWidthPercentage(20),
+  buttonIcon: {
+    textAlign: 'center',
+    color: 'white',
+  },
+  buttonBody: {
+    width: getWidthPercentage(30),
+    height: getHeightPercentage(30),
+    marginLeft: getWidthPercentage(265),
+    marginTop: getHeightPercentage(20),
+    alignItems: 'center',
+    justifyContent: 'center',
+    backgroundColor: '#fe6669',
+    borderRadius: 4,
+  },
+  modal: {
+    backgroundColor: '#d8d8d8',
+  },
+});
+
+export default styles;
diff --git a/mobile-app/src/components/PhotoPicker/PhotoPicker.js b/mobile-app/src/components/PhotoPicker/PhotoPicker.js
index ad62362b79..cc70123207 100644
--- a/mobile-app/src/components/PhotoPicker/PhotoPicker.js
+++ b/mobile-app/src/components/PhotoPicker/PhotoPicker.js
@@ -1,11 +1,16 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Image, View, Text, TouchableOpacity, ScrollView } from 'react-native';
+import {
+  View,
+  Text,
+  TouchableOpacity,
+  ScrollView,
+} from 'react-native';
 import { Ionicons } from '@expo/vector-icons';
-import _ from 'lodash';
 import { translate } from 'react-i18next';
 
 import { AlertModal } from '../AlertModal';
+import { PhotoModal } from '../PhotoModal';
 import { LazyImage } from './components/LazyImage';
 
 import styles from './styles';
@@ -35,6 +40,7 @@ class Photo extends React.Component {
     super(props);
     this.state = {
       showingConfirm: false,
+      showZoomedPhoto: false,
     };
 
     this.buttons = [
@@ -49,57 +55,92 @@ class Photo extends React.Component {
       },
     ];
   }
+
   setConfirmState = (showingConfirm) => {
     this.setState({
       showingConfirm,
     });
-  };
+  }
+
   handlePhotoDeletePress = () => {
     this.setConfirmState(true);
-  };
+  }
+
   handleModalClosed = () => {
     this.setConfirmState(false);
-  };
+  }
+
   handleModalConfirmed = () => {
     this.setConfirmState(false);
-    this.props.onPress();
-  };
+    this.props.onDeletePress();
+  }
+
+  openZoomedPhoto = () => {
+    const { photo } = this.props;
+    this.setState({
+      zoomedPhotoUrl: photo.mediumPhotoUrl,
+      showZoomedPhoto: true,
+    });
+  }
+
+  closeZoomedPhoto = () => {
+    this.setState({
+      showZoomedPhoto: false,
+    });
+  }
+
   render() {
-    const { photo, onPress } = this.props;
+    const { photo, onDeletePress } = this.props;
     const { showingConfirm } = this.state;
     return (
-      <LazyImage key={photo} style={[styles.photo]} source={{ uri: photo }}>
-        <View>
-          {onPress &&
-            <TouchableOpacity
-              onPress={this.handlePhotoDeletePress}
-              style={styles.photoButtonContainer}
-            >
-              <Ionicons
-                size={styles.$photoSize}
-                name="md-close"
-                style={styles.photoButton}
-              />
-            </TouchableOpacity>}
-
-          <AlertModal
-            visible={showingConfirm}
-            buttons={this.buttons}
-            onOverlayPress={this.handleModalClosed}
-            title={this.props.t('label_delete_photo_title')}
-            subtitle={this.props.t('label_delete_photo_subtitle')}
+      <TouchableOpacity onPress={this.openZoomedPhoto}>
+        <LazyImage
+          key={photo}
+          style={[styles.photo]}
+          source={{ uri: photo.thumbnailUrl }}
+        >
+          <PhotoModal
+            visible={this.state.showZoomedPhoto}
+            onRequestClose={this.closeZoomedPhoto}
+            photoUrl={this.state.zoomedPhotoUrl}
           />
-        </View>
-      </LazyImage>
+          <View>
+            {onDeletePress &&
+              <TouchableOpacity
+                onPress={this.handlePhotoDeletePress}
+                style={styles.photoButtonContainer}
+              >
+                <Ionicons
+                  size={styles.$photoSize}
+                  name="md-close"
+                  style={styles.photoButton}
+                />
+              </TouchableOpacity>}
+
+            <AlertModal
+              visible={showingConfirm}
+              buttons={this.buttons}
+              onOverlayPress={this.handleModalClosed}
+              title={this.props.t('label_delete_photo_title')}
+              subtitle={this.props.t('label_delete_photo_subtitle')}
+            />
+          </View>
+        </LazyImage>
+      </TouchableOpacity>
     );
   }
 }
+
 Photo.defaultProps = {
-  onPress: undefined,
+  onDeletePress: undefined,
 };
+
 Photo.propTypes = {
-  photo: PropTypes.string.isRequired,
-  onPress: PropTypes.func,
+  photo: PropTypes.shape({
+    thumbnailUrl: PropTypes.string.isRequired,
+    mediumPhotoUrl: PropTypes.string.isRequired,
+  }).isRequired,
+  onDeletePress: PropTypes.func,
 };
 
 const PhotoComponent = translate()(Photo);
@@ -131,15 +172,15 @@ const PhotoPicker = ({
         style={styles.photoContainer}
       >
         {hasPhotos &&
-          photos.map((uri, index) => {
+          photos.map((photo, index) => {
             const onDeletePhotoPress = hasDelete
               ? () => onDeletePress(index)
               : undefined;
             return (
               <PhotoComponent
-                key={uri}
-                photo={uri}
-                onPress={onDeletePhotoPress}
+                key={photo.thumbnailUrl}
+                photo={photo}
+                onDeletePress={onDeletePhotoPress}
               />
             );
           })}
@@ -152,15 +193,21 @@ const PhotoPicker = ({
     </View>
   );
 };
+
 PhotoPicker.defaultProps = {
   maxPhotos: undefined,
   onDeletePress: undefined,
   onAddPress: undefined,
 };
+
 PhotoPicker.propTypes = {
-  photos: PropTypes.arrayOf(PropTypes.string.isRequired).isRequired,
+  photos: PropTypes.arrayOf(PropTypes.shape({
+    thumbnailUrl: PropTypes.string.isRequired,
+    mediumPhotoUrl: PropTypes.string.isRequired,
+  }).isRequired).isRequired,
   onDeletePress: PropTypes.func,
   onAddPress: PropTypes.func,
   maxPhotos: PropTypes.number,
 };
+
 export default translate()(PhotoPicker);
diff --git a/mobile-app/src/config/i18n.js b/mobile-app/src/config/i18n.js
index 13caca3f01..7277b290e5 100644
--- a/mobile-app/src/config/i18n.js
+++ b/mobile-app/src/config/i18n.js
@@ -45,13 +45,13 @@ i18n.use(languageDetector).init({
 // i18n.addResources('ar', 'general', require('../trans/ar.json'));
 // i18n.addResources('ay', 'general', require('../trans/ay.json'));
 
-// i18n.addResources('be', 'general', require('../trans/be.json'));
+i18n.addResources('be', 'general', require('../trans/be.json'));
 // i18n.addResources('bg', 'general', require('../trans/bg.json'));
 // i18n.addResources('bo', 'general', require('../trans/bo.json'));
 // i18n.addResources('bs', 'general', require('../trans/bs.json'));
 
 // i18n.addResources('ca', 'general', require('../trans/ca.json'));
-// i18n.addResources('ceb', 'general', require('../trans/ceb.json'));
+i18n.addResources('ceb', 'general', require('../trans/ceb.json'));
 // i18n.addResources('cs', 'general', require('../trans/cs.json'));
 // i18n.addResources('csb', 'general', require('../trans/csb.json'));
 // i18n.addResources('cy', 'general', require('../trans/cy.json'));
@@ -60,15 +60,15 @@ i18n.use(languageDetector).init({
 // i18n.addResources('de', 'general', require('../trans/de.json'));
 
 // i18n.addResources('ee', 'general', require('../trans/ee.json'));
-// i18n.addResources('el', 'general', require('../trans/el.json'));
+i18n.addResources('el', 'general', require('../trans/el.json'));
 i18n.addResources('en', 'general', require('../trans/en.json'));
 i18n.addResources('es', 'general', require('../trans/es.json'));
-// i18n.addResources('et', 'general', require('../trans/et.json'));
+i18n.addResources('et', 'general', require('../trans/et.json'));
 // i18n.addResources('eu', 'general', require('../trans/eu.json'));
 
 // i18n.addResources('fa', 'general', require('../trans/fa.json'));
 // i18n.addResources('fi', 'general', require('../trans/fi.json'));
-// i18n.addResources('fil', 'general', require('../trans/fil.json'));
+i18n.addResources('fil', 'general', require('../trans/fil.json'));
 // i18n.addResources('fj', 'general', require('../trans/fj.json'));
 i18n.addResources('fr', 'general', require('../trans/fr.json'));
 
@@ -83,7 +83,7 @@ i18n.addResources('hi', 'general', require('../trans/hi.json'));
 // i18n.addResources('hmn', 'general', require('../trans/hmn.json'));
 // i18n.addResources('hr', 'general', require('../trans/hr.json'));
 // i18n.addResources('ht', 'general', require('../trans/ht.json'));
-// i18n.addResources('hu', 'general', require('../trans/hu.json'));
+i18n.addResources('hu', 'general', require('../trans/hu.json'));
 // i18n.addResources('hy', 'general', require('../trans/hy.json'));
 
 // Android sends 'in' as language id for Indonesia (it should be id)
@@ -91,7 +91,7 @@ i18n.addResources('in', 'general', require('../trans/id.json'));
 // i18n.addResources('ig', 'general', require('../trans/ig.json'));
 // i18n.addResources('io', 'general', require('../trans/io.json'));
 // i18n.addResources('is', 'general', require('../trans/is.json'));
-// i18n.addResources('it', 'general', require('../trans/it.json'));
+i18n.addResources('it', 'general', require('../trans/it.json'));
 
 // i18n.addResources('ja', 'general', require('../trans/ja.json'));
 // i18n.addResources('jv', 'general', require('../trans/jv.json'));
@@ -107,7 +107,7 @@ i18n.addResources('in', 'general', require('../trans/id.json'));
 
 // i18n.addResources('lg', 'general', require('../trans/lg.json'));
 // i18n.addResources('lo', 'general', require('../trans/lo.json'));
-// i18n.addResources('lt', 'general', require('../trans/lt.json'));
+i18n.addResources('lt', 'general', require('../trans/lt.json'));
 // i18n.addResources('lv', 'general', require('../trans/lv.json'));
 
 // i18n.addResources('mg', 'general', require('../trans/mg.json'));
@@ -118,18 +118,18 @@ i18n.addResources('in', 'general', require('../trans/id.json'));
 
 // i18n.addResources('na', 'general', require('../trans/na.json'));
 // i18n.addResources('ne', 'general', require('../trans/ne.json'));
-// i18n.addResources('nl', 'general', require('../trans/nl.json'));
-// i18n.addResources('no', 'general', require('../trans/no.json'));
+i18n.addResources('nl', 'general', require('../trans/nl.json'));
+i18n.addResources('no', 'general', require('../trans/no.json'));
 
 // i18n.addResources('pap', 'general', require('../trans/pap.json'));
 // i18n.addResources('pcm', 'general', require('../trans/pcm.json'));
-// i18n.addResources('pl', 'general', require('../trans/pl.json'));
-// i18n.addResources('pt', 'general', require('../trans/pt.json'));
+i18n.addResources('pl', 'general', require('../trans/pl.json'));
+i18n.addResources('pt', 'general', require('../trans/pt.json'));
 
 // i18n.addResources('qu', 'general', require('../trans/qu.json'));
 // i18n.addResources('quc', 'general', require('../trans/quc.json'));
 
-// i18n.addResources('ro', 'general', require('../trans/ro.json'));
+i18n.addResources('ro', 'general', require('../trans/ro.json'));
 i18n.addResources('ru', 'general', require('../trans/ru.json'));
 // i18n.addResources('rw', 'general', require('../trans/rw.json'));
 // i18n.addResources('ry', 'general', require('../trans/ry.json'));
@@ -137,9 +137,9 @@ i18n.addResources('ru', 'general', require('../trans/ru.json'));
 // i18n.addResources('sco', 'general', require('../trans/sco.json'));
 // i18n.addResources('si', 'general', require('../trans/si.json'));
 // i18n.addResources('sk', 'general', require('../trans/sk.json'));
-// i18n.addResources('sl', 'general', require('../trans/sl.json'));
+i18n.addResources('sl', 'general', require('../trans/sl.json'));
 // i18n.addResources('so', 'general', require('../trans/so.json'));
-// i18n.addResources('sq', 'general', require('../trans/sq.json'));
+i18n.addResources('sq', 'general', require('../trans/sq.json'));
 // i18n.addResources('sv', 'general', require('../trans/sv.json'));
 // i18n.addResources('sw', 'general', require('../trans/sw.json'));
 
@@ -148,16 +148,16 @@ i18n.addResources('ru', 'general', require('../trans/ru.json'));
 // i18n.addResources('tg', 'general', require('../trans/tg.json'));
 // i18n.addResources('th', 'general', require('../trans/th.json'));
 // i18n.addResources('tk', 'general', require('../trans/tk.json'));
-// i18n.addResources('tl', 'general', require('../trans/tl.json'));
+i18n.addResources('tl', 'general', require('../trans/tl.json'));
 // i18n.addResources('tn', 'general', require('../trans/tn.json'));
-// i18n.addResources('tr', 'general', require('../trans/tr.json'));
+i18n.addResources('tr', 'general', require('../trans/tr.json'));
 // i18n.addResources('ty', 'general', require('../trans/ty.json'));
 
 // i18n.addResources('ug', 'general', require('../trans/ug.json'));
-// i18n.addResources('uk', 'general', require('../trans/uk.json'));
+i18n.addResources('uk', 'general', require('../trans/uk.json'));
 // i18n.addResources('ur', 'general', require('../trans/ur.json'));
 
-// i18n.addResources('vi', 'general', require('../trans/vi.json'));
+i18n.addResources('vi', 'general', require('../trans/vi.json'));
 // i18n.addResources('vls', 'general', require('../trans/vls.json'));
 
 // i18n.addResources('wo', 'general', require('../trans/wo.json'));
diff --git a/mobile-app/src/config/persist.js b/mobile-app/src/config/persist.js
index 75bc371880..6d888e1445 100644
--- a/mobile-app/src/config/persist.js
+++ b/mobile-app/src/config/persist.js
@@ -2,7 +2,7 @@ import { persistStore } from 'redux-persist';
 import { createFilter } from 'redux-persist-transform-filter';
 
 const appFilter = createFilter('app', ['popover']);
-const userFilter = createFilter('user', ['auth']);
+const userFilter = createFilter('user', ['auth', 'profile']);
 
 export const persistStoreAsync = ({ store, storage }) => {
   return new Promise((resolve, reject) => {
diff --git a/mobile-app/src/reducers/app/actions.js b/mobile-app/src/reducers/app/actions.js
index f0b7c38c49..d962dc0e86 100644
--- a/mobile-app/src/reducers/app/actions.js
+++ b/mobile-app/src/reducers/app/actions.js
@@ -37,6 +37,11 @@ const setActiveScreen = activeScreen => ({
 const setConnectionChecked = () => ({ type: types.SET_CONNECTION_CHECKED });
 const updateNetworkStatus = isConnected =>
   ({ type: types.UPDATE_NETWORK_STATUS, payload: { isConnected } });
+const updateSyncStatus = inSync =>
+  ({ type: types.UPDATE_SYNC_STATUS, payload: { inSync } });
+const updateLackConnMessStatus = noLackConnectionAlert =>
+  ({ type: types.UPDATE_LACK_CONNECTION_MESSAGE_STATUS, payload: { noLackConnectionAlert } });
+
 export default {
   setPopoverShown,
   setPopoverMessage,
@@ -45,4 +50,6 @@ export default {
   hideErrorMessage,
   setConnectionChecked,
   updateNetworkStatus,
+  updateSyncStatus,
+  updateLackConnMessStatus
 };
diff --git a/mobile-app/src/reducers/app/reducers.js b/mobile-app/src/reducers/app/reducers.js
index fb8a39bdfd..32fe8673d9 100644
--- a/mobile-app/src/reducers/app/reducers.js
+++ b/mobile-app/src/reducers/app/reducers.js
@@ -1,10 +1,10 @@
 import { combineReducers } from 'redux';
-
 import types from './types';
+import i18n from '../../config/i18n';
 
 const popoverInitialState = {
   shown: false,
-  message: 'Join other people who are mapping trash!',
+  message: i18n.t('label_text_popover_subtitle'),
 };
 const errorInitialState = {
   visible: false,
@@ -15,6 +15,8 @@ const errorInitialState = {
 const networkStatusState = {
   isConnected: false,
   connectionChecked: false,
+  noLackConnectionAlert: false,
+  inSync: false
 };
 
 const networkReducer = (state = networkStatusState, action) => {
@@ -23,6 +25,10 @@ const networkReducer = (state = networkStatusState, action) => {
       return { ...state, connectionChecked: true };
     case types.UPDATE_NETWORK_STATUS:
       return { ...state, isConnected: action.payload.isConnected };
+    case types.UPDATE_SYNC_STATUS:
+      return { ...state, inSync: action.payload.inSync };
+    case types.UPDATE_LACK_CONNECTION_MESSAGE_STATUS:
+      return { ...state, noLackConnectionAlert: action.payload.noLackConnectionAlert };
     default:
       return state;
   }
diff --git a/mobile-app/src/reducers/app/selectors.js b/mobile-app/src/reducers/app/selectors.js
index 99c8833cdb..43af0540b5 100644
--- a/mobile-app/src/reducers/app/selectors.js
+++ b/mobile-app/src/reducers/app/selectors.js
@@ -31,6 +31,8 @@ const networkSelector = createSelector(stateSelector, state => state.network);
 const wasConnectionChecked =
   createSelector(networkSelector, state => state.connectionChecked);
 const isConnected = createSelector(networkSelector, state => state.isConnected);
+const inSync = createSelector(networkSelector, state => state.inSync);
+const isNoLackConnectionAlert = createSelector(networkSelector, state => state.noLackConnectionAlert);
 
 export default {
   wasPopoverShown,
@@ -46,4 +48,6 @@ export default {
 
   wasConnectionChecked,
   isConnected,
+  inSync,
+  isNoLackConnectionAlert
 };
diff --git a/mobile-app/src/reducers/app/types.js b/mobile-app/src/reducers/app/types.js
index 35461344bb..17930f575a 100644
--- a/mobile-app/src/reducers/app/types.js
+++ b/mobile-app/src/reducers/app/types.js
@@ -8,6 +8,8 @@ const FETCH_DATASETS_FAILED = 'FETCH_DATASETS_FAILED';
 const SET_ACTIVE_SCREEN = 'SET_ACTIVE_SCREEN';
 const UPDATE_NETWORK_STATUS = 'UPDATE_NETWORK_STATUS';
 const SET_CONNECTION_CHECKED = 'SET_CONNECTION_CHECKED';
+const UPDATE_SYNC_STATUS = 'UPDATE_SYNC_STATUS';
+const UPDATE_LACK_CONNECTION_MESSAGE_STATUS = 'UPDATE_LACK_CONNECTION_MESSAGE_STATUS';
 
 export default {
   SET_POPOVER_SHOWN,
@@ -20,4 +22,6 @@ export default {
   SET_ACTIVE_SCREEN,
   UPDATE_NETWORK_STATUS,
   SET_CONNECTION_CHECKED,
+  UPDATE_SYNC_STATUS,
+  UPDATE_LACK_CONNECTION_MESSAGE_STATUS
 };
diff --git a/mobile-app/src/reducers/trashpile/operations.js b/mobile-app/src/reducers/trashpile/operations.js
index 8b12bbd5f6..791c43672a 100644
--- a/mobile-app/src/reducers/trashpile/operations.js
+++ b/mobile-app/src/reducers/trashpile/operations.js
@@ -4,6 +4,7 @@ import { API_ENDPOINTS, TRASHPOINT_IMAGE_TYPES, DIAGONALE_IN_PX, MARKER_DIAGONAL
 DEFAULT_ZOOM, SCREEN_WIDTH} from '../../shared/constants';
 import types from './types';
 import { Api } from '../../services';
+import OfflineService from '../../services/Offline';
 import axios from 'axios';
 import { selectors as appSelectors, operations as appOps } from '../app';
 import { selectors as trashpileSelectors } from '../trashpile';
@@ -201,7 +202,6 @@ export const handleUpload = async ({ photos, markerId }) => {
     failed: [],
     backendConfirmed: false,
   };
-
   if (photosResponse) {
     const thumbnailsPhotos = photosResponse.data
       .filter(pr => pr.type === TRASHPOINT_IMAGE_TYPES.THUMBNAIL)
@@ -226,7 +226,6 @@ export const handleUpload = async ({ photos, markerId }) => {
       });
 
     const handledPhotos = [...thumbnailsPhotos, ...mediumPhotos];
-
     const uploadedPhotosResponses = await uploadPhotosOnAzure(handledPhotos);
 
     if (uploadedPhotosResponses) {
@@ -307,11 +306,24 @@ export const createMarker = ({
           p => p.id !== undefined && p.delete === true && !!p.parentId,
         );
       }
+      const isConnected = appSelectors.isConnected(getState());
+
       const url = isEdit
         ? API_ENDPOINTS.UPDATE_TRASHPOINT(id)
         : API_ENDPOINTS.CREATE_TRASHPOINT;
 
-      const createMarkerResponse = await Api.put(url, newMarker);
+      let createMarkerResponse = false;
+
+      if (isConnected) {
+        createMarkerResponse = await Api.put(url, newMarker);
+      } else {
+        createMarkerResponse = await OfflineService.saveTrashpoint(
+          url,
+          newMarker,
+          photos,
+          !isEdit ? [] : toDeletePhotos
+        );
+      }
 
       if (!createMarkerResponse) {
         dispatch({ type: types.CREATE_MARKER_FAILED });
@@ -320,13 +332,13 @@ export const createMarker = ({
 
       let uploadStatus;
 
-      if (isEdit && newPhotos.length > 0) {
+      if (isEdit && newPhotos.length > 0 && isConnected) {
         uploadStatus = await handleUpload({
           photos: newPhotos,
           markerId: createMarkerResponse.data.id,
         });
       }
-      if (isEdit && toDeletePhotos.length > 0) {
+      if (isEdit && toDeletePhotos.length > 0 && isConnected) {
         try {
           await Promise.all(
             toDeletePhotos.map(p => deleteImage(id, p.parentId)),
@@ -337,7 +349,7 @@ export const createMarker = ({
         }
       }
 
-      if (!isEdit) {
+      if (!isEdit && isConnected) {
         uploadStatus = await handleUpload({
           photos,
           markerId: createMarkerResponse.data.id,
@@ -357,6 +369,7 @@ export const createMarker = ({
           },
         },
       });
+
       return {
         ...createMarkerResponse.data,
         photoStatus: uploadStatus,
diff --git a/mobile-app/src/screens/CreateMarker/CreateMarker.js b/mobile-app/src/screens/CreateMarker/CreateMarker.js
index 6d7e5ff9e3..8f5ee4e4cd 100644
--- a/mobile-app/src/screens/CreateMarker/CreateMarker.js
+++ b/mobile-app/src/screens/CreateMarker/CreateMarker.js
@@ -92,7 +92,8 @@ class CreateMarker extends Component {
       congratsShown: false,
       trashCompositionTypes: TRASH_COMPOSITION_TYPE_LIST.map(
         trashCompositionType => ({
-          ...trashCompositionType,
+          trashCompositionType.type,
+          props.t(trashCompositionType.label),
           selected: false,
         }),
       ),
diff --git a/mobile-app/src/screens/CreateMarker/components/CongratsModal/styles.js b/mobile-app/src/screens/CreateMarker/components/CongratsModal/styles.js
index e46760e9b2..0f08d389a3 100644
--- a/mobile-app/src/screens/CreateMarker/components/CongratsModal/styles.js
+++ b/mobile-app/src/screens/CreateMarker/components/CongratsModal/styles.js
@@ -23,8 +23,8 @@ export default EStyleSheet.create({
   },
   header: {
     width: getWidthPercentage(148),
-    height: getHeightPercentage(45),
-    marginTop: getHeightPercentage(30),
+    height: getHeightPercentage(80),
+    marginTop: getHeightPercentage(15),
     fontFamily: '$boldFont',
     fontSize: 30,
     textAlign: 'center',
diff --git a/mobile-app/src/screens/Details/Details.js b/mobile-app/src/screens/Details/Details.js
index 5a80036b05..5d6ce9ba53 100644
--- a/mobile-app/src/screens/Details/Details.js
+++ b/mobile-app/src/screens/Details/Details.js
@@ -288,7 +288,9 @@ class Details extends Component {
     if (marker && marker.name) {
       return marker.name;
     }
-    return '';
+
+    const { initialLocation: { longitude, latitude } } = this.state;
+    return `${latitude.toFixed(2)}, ${longitude.toFixed(2)}`;
   };
   renderStreetDetails = () => {
     const { address } = this.state;
@@ -308,7 +310,7 @@ class Details extends Component {
     // {`${this.renderStreetDetails()} | ${latitude.toFixed(
     //             6,
     //           )}, ${longitude.toFixed(6)}`}
-    const streetDetails = this.renderStreetDetails();
+    const streetDetails = this.renderStreetDetails().trim();
     const gpsCoords = this.renderMarkerCoords();
     if (streetDetails && gpsCoords) {
       return `${streetDetails} | ${gpsCoords}`;
@@ -331,9 +333,15 @@ class Details extends Component {
     const latitudeDelta = DEFAULT_ZOOM;
     const mapHeight = getHeightPercentage(160);
     const longitudeDelta = latitudeDelta * SCREEN_WIDTH / mapHeight;
-    const thumbnails = _.has(marker, 'thumbnails')
-      ? marker.thumbnails.map(({ url }) => url)
-      : [];
+    const thumbnails = marker.thumbnails || [];
+    const mediumPhotos = marker.mediumPhotos || [];
+
+    const photos = thumbnails.map(thumbnail => ({
+      thumbnailUrl: thumbnail.url,
+      mediumPhotoUrl: mediumPhotos.find(
+        mediumPhoto => mediumPhoto.id === thumbnail.parentId,
+      ).url,
+    }));
 
     return (
       <ScrollView style={styles.container}>
@@ -392,7 +400,7 @@ class Details extends Component {
           {/* </View>*/}
         </View>
         <View>
-          <PhotoPicker maxPhotos={3} photos={thumbnails} title={this.props.t('label_text_detailsTP_photos')} />
+          <PhotoPicker maxPhotos={3} photos={photos} title={this.props.t('label_text_detailsTP_photos')} />
         </View>
         <Divider />
         <View style={{ padding: getWidthPercentage(20) }}>
diff --git a/mobile-app/src/screens/EditTrashpoint/.EditTrashpoint.js.swp b/mobile-app/src/screens/EditTrashpoint/.EditTrashpoint.js.swp
deleted file mode 100644
index 364dc76d88..0000000000
Binary files a/mobile-app/src/screens/EditTrashpoint/.EditTrashpoint.js.swp and /dev/null differ
diff --git a/mobile-app/src/screens/EditTrashpoint/EditTrashpoint.js b/mobile-app/src/screens/EditTrashpoint/EditTrashpoint.js
index 2560e3de73..50bd888331 100644
--- a/mobile-app/src/screens/EditTrashpoint/EditTrashpoint.js
+++ b/mobile-app/src/screens/EditTrashpoint/EditTrashpoint.js
@@ -108,7 +108,8 @@ class EditTrashpoint extends Component {
       trashCompositionTypes: TRASH_COMPOSITION_TYPE_LIST.map(
         (trashCompositionType) => {
           return {
-            ...trashCompositionType,
+            trashCompositionType.type,
+            props.t(trashCompositionType.label),
             selected: marker.composition.indexOf(trashCompositionType.type) !== -1,
           };
         },
diff --git a/mobile-app/src/screens/Home.js b/mobile-app/src/screens/Home.js
index 5c9a002afd..de402cd540 100644
--- a/mobile-app/src/screens/Home.js
+++ b/mobile-app/src/screens/Home.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { StatusBar, View } from 'react-native';
+import { StatusBar, View, Text } from 'react-native';
 import { connect } from 'react-redux';
 import { compose } from 'recompose';
 
@@ -14,6 +14,8 @@ import { selectors as appSelectors } from '../reducers/app';
 import { SCREENS } from '../shared/constants';
 import { DELTA_HASH, GRID_HASH, MIN_ZOOM } from '../shared/constants';
 import _ from 'lodash';
+import {translate} from 'react-i18next';
+import styles from './styles';
 
 class Home extends Component {
   state = {
@@ -34,7 +36,7 @@ class Home extends Component {
       marker => marker.id === event.nativeEvent.id,
     );
 
-    if (!marker.isTrashpile) {
+    if (!marker || !marker.isTrashpile) {
       return;
     }
 
@@ -105,9 +107,29 @@ class Home extends Component {
     });
   };
 
+  displayNoConnected = (latitude,  longitude) => {
+    return (
+      <View style={styles.noConnectedView}>
+        <Text style={styles.noConnectedHeader}>
+          {this.props.t('label_network_off_warning_title')}
+        </Text>
+        <Text style={styles.noConnectedText}>
+          {this.props.t('label_no_connection_note')}
+        </Text>
+        <Text style={styles.noConnectedText}>
+          {this.props.t('label_your_coordinates')}
+          {`: ${latitude.toFixed(2)}, ${longitude.toFixed(2)}`}
+        </Text>
+      </View>
+    );
+  };
+
   render() {
-    const { markers, initialRegion } = this.props;
+    const { markers, initialRegion, isConnected, userLocation: { longitude, latitude } } = this.props;
 
+    if (!isConnected) {
+      return this.displayNoConnected(latitude,  longitude);
+    }
     return (
       <View style={{ flex: 1 }}>
         <StatusBar translucent={false} barStyle="default" />
@@ -135,6 +157,7 @@ const mapStateToProps = state => {
     activeScreen: appSelectors.getActiveScreen(state),
     userLocation: locationSelectors.userLocationSelector(state),
     delta: trashpileSelectors.getLastDeltaValue(state),
+    isConnected: appSelectors.isConnected(state),
   };
 };
 
@@ -164,4 +187,5 @@ const mapDispatchToProps = dispatch => {
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
   withNavigationHelpers(),
+  translate(),
 )(Home);
diff --git a/mobile-app/src/screens/MyActivity/MyActivity.js b/mobile-app/src/screens/MyActivity/MyActivity.js
index 90c52b3d3c..d46ccea3c1 100644
--- a/mobile-app/src/screens/MyActivity/MyActivity.js
+++ b/mobile-app/src/screens/MyActivity/MyActivity.js
@@ -19,6 +19,7 @@ import {
   selectors as trashSels,
   operations as trashOps,
 } from '../../reducers/trashpile';
+import { selectors as appSelectors } from '../../reducers/app';
 import ActivityListItem from './components/ActivityListItem';
 import { Divider } from '../../components/Divider';
 import { EmptyStateScreen } from '../../components/EmptyStateScreen';
@@ -110,13 +111,13 @@ class MyActivity extends PureComponent {
   };
 
   render() {
-    const { loading, error, initialLoad, refreshing } = this.props;
+    const { loading, error, initialLoad, refreshing, isConnected } = this.props;
 
-    if (!initialLoad && error) {
+    if (!initialLoad && error && isConnected) {
       return this.displayRetry();
     }
 
-    if (!initialLoad && loading && !refreshing) {
+    if (!initialLoad && loading && !refreshing || !isConnected) {
       return this.displayLoading();
     }
 
@@ -132,6 +133,7 @@ MyActivity.propTypes = {
   canLoadMore: PropTypes.bool.isRequired,
   refreshing: PropTypes.bool.isRequired,
   fetchUserTrashpoints: PropTypes.func.isRequired,
+  isConnected: PropTypes.bool.isRequired,
 };
 
 const mapStateToProps = state => ({
@@ -141,6 +143,7 @@ const mapStateToProps = state => ({
   initialLoad: trashSels.userTrashpointsInitialLoaded(state),
   canLoadMore: trashSels.userTrashpointsCanLoadMore(state),
   refreshing: trashSels.userTrashpointsRefreshing(state),
+  isConnected: appSelectors.isConnected(state),
 });
 const mapDispatch = {
   fetchUserTrashpoints: trashOps.fetchUserTrashpoints,
diff --git a/mobile-app/src/screens/MyActivity/components/ActivityListItem.js b/mobile-app/src/screens/MyActivity/components/ActivityListItem.js
index a05a2ab09f..ab29c2cf89 100644
--- a/mobile-app/src/screens/MyActivity/components/ActivityListItem.js
+++ b/mobile-app/src/screens/MyActivity/components/ActivityListItem.js
@@ -54,6 +54,17 @@ const ActivityListItem = ({
   onPressItem,
 }) => {
   const statusStyle = { backgroundColor: STATUSES_COLOR[status] };
+  let nameToList = name.trim();
+  let addressToList = address.trim();
+  if (!nameToList || !addressToList) {
+    const { longitude, latitude } = location;
+    if (!nameToList) {
+      nameToList = `${latitude.toFixed(3)}, ${longitude.toFixed(3)}`;
+    }
+    if (!addressToList) {
+      addressToList = `${latitude.toFixed(6)}, ${longitude.toFixed(6)}`;
+    }
+  }
   return (
     <TouchableHighlight
       onPress={() => onPressItem({ id, location })}
@@ -66,12 +77,12 @@ const ActivityListItem = ({
         <View style={styles.textsContainer}>
           <View style={{ paddingBottom: 2 }}>
             <Text style={styles.name}>
-              {name}
+              {nameToList}
             </Text>
           </View>
           <View>
             <Text style={styles.address}>
-              {address}
+              {addressToList}
             </Text>
           </View>
         </View>
diff --git a/mobile-app/src/screens/Profile/Profile.js b/mobile-app/src/screens/Profile/Profile.js
index 1b83d6580c..fe8bed1ded 100644
--- a/mobile-app/src/screens/Profile/Profile.js
+++ b/mobile-app/src/screens/Profile/Profile.js
@@ -1,14 +1,23 @@
 import React, { Component } from 'react';
-import { View, Image, Text } from 'react-native';
+import { View, Image, Text, ActivityIndicator } from 'react-native';
 import { compose } from 'recompose';
 import { connect } from 'react-redux';
 
 import { Divider } from '../../components/Divider';
 import { selectors as userSelectors } from '../../reducers/user';
+import { selectors as appSelectors } from '../../reducers/app';
 import { withNavigationHelpers } from '../../services/Navigation';
 import styles from './styles';
 
+
 class Profile extends Component {
+  displayLoading = () => {
+    return (
+      <View style={styles.displayLoadingView}>
+        <ActivityIndicator />
+      </View>
+    );
+  };
   renderProfilePicture = (profile) => {
     const img = profile && profile.pictureURL
       ? { uri: profile.pictureURL }
@@ -16,7 +25,10 @@ class Profile extends Component {
     return <Image source={img} style={styles.usernameImage} />;
   };
   render() {
-    const { profile, country } = this.props;
+    const { profile, country, isConnected } = this.props;
+    if(!isConnected) {
+      return this.displayLoading();
+    }
     return (
       <View style={styles.container}>
         <View style={styles.infoContainer}>
@@ -50,6 +62,7 @@ const mapStateToProps = (state) => {
   return {
     profile: userSelectors.getProfile(state),
     country: userSelectors.getProfileCountry(state),
+    isConnected: appSelectors.isConnected(state),
   };
 };
 
diff --git a/mobile-app/src/screens/Profile/styles.js b/mobile-app/src/screens/Profile/styles.js
index 950c29976f..1b95df9388 100644
--- a/mobile-app/src/screens/Profile/styles.js
+++ b/mobile-app/src/screens/Profile/styles.js
@@ -42,4 +42,9 @@ export default EStyleSheet.create({
     marginTop: getHeightPercentage(20),
     alignItems: 'center',
   },
+  displayLoadingView: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
 });
diff --git a/mobile-app/src/screens/Settings/Settings.js b/mobile-app/src/screens/Settings/Settings.js
index 9e50eb3d07..a5b297b80a 100644
--- a/mobile-app/src/screens/Settings/Settings.js
+++ b/mobile-app/src/screens/Settings/Settings.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { View } from 'react-native';
+import { View, ActivityIndicator } from 'react-native';
 import { compose } from 'recompose';
 import { connect } from 'react-redux';
 import { translate } from 'react-i18next';
@@ -20,6 +20,7 @@ import styles, {
   downRightIcon,
   defaultRightIcon,
 } from './styles';
+import {selectors as appSelectors} from '../../reducers/app';
 
 class Settings extends Component {
   constructor(props) {
@@ -103,11 +104,24 @@ class Settings extends Component {
     );
   };
 
+  displayLoading = () => {
+    return (
+      <View style={styles.displayLoadingView}>
+        <ActivityIndicator />
+      </View>
+    );
+  };
+
   render() {
-    const { country } = this.props;
+    const { country, isConnected } = this.props;
+    if(!isConnected) {
+      return this.displayLoading();
+    }
+
     const countrySubtitle = country
       ? country.name
       : this.props.t('label_country_picker_placeholder');
+
     return (
       <View>
         <View style={styles.listContainer}>
@@ -157,11 +171,13 @@ class Settings extends Component {
     );
   }
 }
+
 const mapState = (state) => {
   return {
     profile: userSels.getProfile(state),
     country: userSels.getProfileCountry(state),
     isProfileUpdating: userSels.isProfileUpdating(state),
+    isConnected: appSelectors.isConnected(state),
   };
 };
 const mapDispatch = {
diff --git a/mobile-app/src/screens/Settings/components/CountryModal/CountryModal.js b/mobile-app/src/screens/Settings/components/CountryModal/CountryModal.js
index 0dfe13f36f..5f99697311 100644
--- a/mobile-app/src/screens/Settings/components/CountryModal/CountryModal.js
+++ b/mobile-app/src/screens/Settings/components/CountryModal/CountryModal.js
@@ -51,11 +51,11 @@ class CountryModal extends Component {
           <Header
             onPressLeftButton={onClose}
             title={this.props.t('label_header_select_country')}
-            titleLeftButton="Cancel"
+            titleLeftButton={this.props.t('label_button_cancel')}
           />
           <FormInput
             containerStyle={styles.inputContainer}
-            placeholder="Search"
+            placeholder={this.props.t('label_text_select_country_hint')}
             value={search}
             onChangeText={onSearchChange}
           />
diff --git a/mobile-app/src/screens/Settings/styles.js b/mobile-app/src/screens/Settings/styles.js
index a2c5661dc8..6247b8b422 100644
--- a/mobile-app/src/screens/Settings/styles.js
+++ b/mobile-app/src/screens/Settings/styles.js
@@ -34,6 +34,11 @@ const styles = EStyleSheet.create({
     marginBottom: 0,
     fontSize: 20,
   },
+  displayLoadingView: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
 });
 export default styles;
 export const rightIcon = {
diff --git a/mobile-app/src/screens/styles.js b/mobile-app/src/screens/styles.js
new file mode 100644
index 0000000000..72b2dc42ad
--- /dev/null
+++ b/mobile-app/src/screens/styles.js
@@ -0,0 +1,18 @@
+import EStyleSheet from 'react-native-extended-stylesheet';
+
+export default EStyleSheet.create({
+  noConnectedView: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  noConnectedHeader: {
+    fontWeight: 'bold',
+    textAlign: 'center',
+    margin: 5,
+  },
+  noConnectedText: {
+    textAlign: 'center',
+    margin: 5,
+  },
+});
diff --git a/mobile-app/src/services/Api.js b/mobile-app/src/services/Api.js
index 0d45ecff2f..0efa57d7ff 100644
--- a/mobile-app/src/services/Api.js
+++ b/mobile-app/src/services/Api.js
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import store from '../config/store';
-import { operations as appOperations } from '../reducers/app';
+import { operations as appOperations, selectors as appSelectors } from '../reducers/app';
 import { operations as userOps } from '../reducers/user';
 import { GENERIC_SERVER_ERROR, ERRORS } from '../shared/constants';
 import { resetTo, rootNav } from '../services/Navigation';
@@ -28,7 +28,9 @@ export const handleApiError = (error) => {
     )} [${error.response.status}]`;
     store.dispatch(appOperations.setErrorMessage(message));
   } else {
-    store.dispatch(appOperations.setErrorMessage(error.message));
+    if (!appSelectors.isNoLackConnectionAlert) {
+      store.dispatch(appOperations.setErrorMessage(error.message));
+    }
   }
 };
 
diff --git a/mobile-app/src/services/Network.js b/mobile-app/src/services/Network.js
index 182e73a6f4..9b95404c57 100644
--- a/mobile-app/src/services/Network.js
+++ b/mobile-app/src/services/Network.js
@@ -8,6 +8,8 @@ import { connect } from 'react-redux';
 
 import { operations as appOps, selectors as appSels } from '../reducers/app';
 import { AlertModal } from '../components/AlertModal';
+import OfflineService from './Offline';
+import { resetTo, rootNav } from '../services/Navigation';
 
 const CONNECTION_CHECK_INTERVAL = 10; // seconds
 
@@ -15,11 +17,15 @@ const mapState = (state) => {
   return {
     isConnected: appSels.isConnected(state),
     connectionChecked: appSels.wasConnectionChecked(state),
+    inSync: appSels.inSync(state),
+    isNoLackConnectionAlert: appSels.isNoLackConnectionAlert(state),
   };
 };
 const mapDispatch = {
   setConnectionChecked: appOps.setConnectionChecked,
   updateNetworkStatus: appOps.updateNetworkStatus,
+  updateSyncStatus: appOps.updateSyncStatus,
+  updateLackConnMessStatus: appOps.updateLackConnMessStatus,
 };
 
 export const withNetworkGuard = () => (WrappedComponent) => {
@@ -28,9 +34,14 @@ export const withNetworkGuard = () => (WrappedComponent) => {
     static propTypes = {
       updateNetworkStatus: PropTypes.func.isRequired,
       setConnectionChecked: PropTypes.func.isRequired,
+      updateSyncStatus: PropTypes.func.isRequired,
+      updateLackConnMessStatus: PropTypes.func.isRequired,
       isConnected: PropTypes.bool.isRequired,
       connectionChecked: PropTypes.bool.isRequired,
+      inSync: PropTypes.bool.isRequired,
+      isNoLackConnectionAlert: PropTypes.bool.isRequired,
     }
+
     constructor(props) {
       super(props);
 
@@ -38,6 +49,14 @@ export const withNetworkGuard = () => (WrappedComponent) => {
       // so it can be discarded safely from netinfo when the component unmounts
       this.handleConnectionStatusChanged =
         this.handleConnectionStatusChanged.bind(this);
+
+      this.handleCloseAlertModal =
+        this.handleCloseAlertModal.bind(this);
+
+      this.closeAlertModalButton = {
+        text: props.t('label_button_acknowledge'),
+        onPress: this.handleCloseAlertModal,
+      };
     }
     componentWillMount() {
       this.checkConnection();
@@ -48,6 +67,17 @@ export const withNetworkGuard = () => (WrappedComponent) => {
         if (isConnected !== this.props.isConnected) {
           this.handleConnectionStatusChanged(isConnected);
         }
+
+        if (isConnected && !this.props.inSync) {
+          this.handleSyncStatusChanged(true);
+          await OfflineService.syncToServer();
+          this.handleSyncStatusChanged(false);
+        }
+
+        if (this.props.isNoLackConnectionAlert && isConnected) {
+          this.props.updateLackConnMessStatus(!1);
+        }
+
       }, 1000 * CONNECTION_CHECK_INTERVAL);
     }
     componentWillUnmount() {
@@ -59,9 +89,17 @@ export const withNetworkGuard = () => (WrappedComponent) => {
         clearInterval(this.connectionCheckInterval);
       }
     }
+    handleSyncStatusChanged(inSync) {
+      this.props.updateSyncStatus(inSync);
+    }
     handleConnectionStatusChanged(isConnected) {
       this.props.updateNetworkStatus(isConnected);
     }
+    handleCloseAlertModal() {
+      this.props.updateLackConnMessStatus(!0);
+      const defaultOfflineScreen = 'Tabs';
+      resetTo(rootNav, defaultOfflineScreen);
+    }
     checkConnection = async () => {
       let isConnected = await NetInfo.isConnected.fetch();
 
@@ -79,8 +117,8 @@ export const withNetworkGuard = () => (WrappedComponent) => {
       this.props.setConnectionChecked();
     };
     render() {
-      const { connectionChecked, isConnected } = this.props;
-      const showUserWarning = connectionChecked && !isConnected;
+      const { connectionChecked, isConnected, isNoLackConnectionAlert } = this.props;
+      const showUserWarning = connectionChecked && !isConnected && !isNoLackConnectionAlert;
 
       if (!connectionChecked) {
         return (
@@ -97,6 +135,7 @@ export const withNetworkGuard = () => (WrappedComponent) => {
             visible={showUserWarning}
             title={this.props.t('label_network_off_warning_title')}
             subtitle={this.props.t('label_network_off_warning')}
+            buttons={[this.closeAlertModalButton]}
           />
           <WrappedComponent {...this.props} />
         </View>
diff --git a/mobile-app/src/services/Offline.js b/mobile-app/src/services/Offline.js
new file mode 100644
index 0000000000..12efae85bf
--- /dev/null
+++ b/mobile-app/src/services/Offline.js
@@ -0,0 +1,107 @@
+import { SQLite } from 'expo';
+import { Api } from "./index";
+import { trashpileReducer } from '../reducers';
+import { handleUpload, deleteImage } from "../reducers/trashpile/operations";
+
+const offlineDB = SQLite.openDatabase('db.offline');
+
+class OfflineService {
+
+  constructor() {
+    this.executeSql('CREATE TABLE IF NOT EXISTS trashpoints (' +
+      'id INTEGER PRIMARY KEY AUTOINCREMENT,' +
+      'url TEXT,' +
+      'marker TEXT,' +
+      'photos BLOB,' +
+      'dphotos BLOB,' +
+      'status INTEGER DEFAULT 0' +
+    ');');
+  }
+
+  executeSql = async (sql, params = []) => {
+    return new Promise((resolve, reject) => offlineDB.transaction(tx => {
+      tx.executeSql(sql, params, (_, { rows }) => resolve(rows._array), reject)
+    }))
+  }
+
+  saveTrashpoint = async (url, newMarker, photos, deletedPhotos) => {
+    const { location: { longitude, latitude } } = newMarker;
+    if (!newMarker.address || newMarker.address.length < 1) {
+      newMarker.address = ' ';
+    }
+    if (!newMarker.name || newMarker.name.length < 1) {
+      newMarker.name = `${latitude.toFixed(2)}, ${longitude.toFixed(2)}`;
+    }
+    await this.executeSql('INSERT INTO trashpoints (url, marker, photos, dphotos) VALUES (?, ?, ?, ?);', [
+      url,
+      JSON.stringify(newMarker),
+      JSON.stringify(photos),
+      JSON.stringify(deletedPhotos)
+    ]);
+    const dummyReturn = {data: newMarker};
+
+    return dummyReturn;
+  }
+
+  async syncToServer() {
+    const transaction = await offlineDB.transaction(tx => {
+      tx.executeSql('SELECT id FROM trashpoints WHERE status = 0', [], async (_, { rows: { _array } }) => {
+        const idsToPush = [];
+        for (let i = 0; i < _array.length; i++) {
+          idsToPush.push(_array[i].id);
+        }
+        if (idsToPush.length > 0) {
+          const whereIds = idsToPush.join(',');
+          tx.executeSql('UPDATE trashpoints SET status = 1 WHERE id IN (' + whereIds + ')', []);
+          tx.executeSql(
+            'SELECT id, url, marker, photos, dphotos, status FROM trashpoints WHERE id IN (' + whereIds + ')',
+            [], async (_, { rows: { _array } }) => {
+              for (let i = 0; i < _array.length; i++) {
+                let dataOk = true;
+                let trashpoint = {};
+                try {
+                  trashpoint = {id: _array[i].id, url: _array[i].url};
+                  trashpoint.marker = JSON.parse(_array[i].marker);
+                  trashpoint.photos = JSON.parse(_array[i].photos);
+                  trashpoint.dphotos = JSON.parse(_array[i].dphotos);
+                } catch (e) {
+                  dataOk = false;
+                }
+                if (dataOk) {
+                  const createMarkerResponse = await Api.put(trashpoint.url, trashpoint.marker);
+                  if (createMarkerResponse) {
+                    offlineDB.transaction(tx => {
+                      tx.executeSql('DELETE FROM trashpoints WHERE id = ?;', [trashpoint.id]);
+                    });
+                    if (trashpoint.photos.length > 0) {
+                      await handleUpload({
+                        photos: trashpoint.photos,
+                        markerId: createMarkerResponse.data.id
+                      });
+                    }
+                    if (trashpoint.dphotos.length > 0) {
+                      try {
+                        await Promise.all(
+                          trashpoint.dphotos.map(p => deleteImage(id, p.parentId)),
+                        );
+                      } catch (ex) {
+                        // console.log(ex);
+                      }
+                    }
+                  } else {
+                    offlineDB.transaction(tx => {
+                      tx.executeSql('UPDATE trashpoints SET status = 0 WHERE id = ?;', [trashpoint.id]);
+                    });
+                  }
+                }
+              }
+          });
+        }
+      });
+
+
+    });
+  }
+}
+
+export default new OfflineService();
\ No newline at end of file
diff --git a/mobile-app/src/shared/constants.js b/mobile-app/src/shared/constants.js
index 15fed3f872..1bb369dd8b 100644
--- a/mobile-app/src/shared/constants.js
+++ b/mobile-app/src/shared/constants.js
@@ -62,15 +62,15 @@ export const TRASH_COMPOSITION_TYPES_HASH = {
 };
 
 export const TRASH_COMPOSITION_TYPE_LIST = [
-  { type: 'plastic', label: 'Plastic' },
-  { type: 'metal', label: 'Metal' },
-  { type: 'glass', label: 'Glass' },
-  { type: 'electronics', label: 'Electronics' },
-  { type: 'paper', label: 'Paper/Wood' },
-  { type: 'tyres', label: 'Tyres' },
-  { type: 'domestic waste', label: 'Domestic waste' },
-  { type: 'furniture', label: 'Furniture' },
-  { type: 'organic waste', label: 'Organic waste' },
+  { type: 'plastic', label: 'label_trash_type_plastic' },
+  { type: 'metal', label: 'label_trash_type_metal' },
+  { type: 'glass', label: 'label_trash_type_glass' },
+  { type: 'electronics', label: 'label_trash_type_electro' },
+  { type: 'paper', label: 'label_trash_type_paper' },
+  { type: 'tyres', label: 'label_trash_type_tyres' },
+  { type: 'domestic waste', label: 'label_trash_type_dom_waste' },
+  { type: 'furniture', label: 'label_trash_type_furniture' },
+  { type: 'organic waste', label: 'label_trash_type_org_waste' },
 ];
 
 export const AMOUNT_HASH = {
diff --git a/mobile-app/src/trans/aa.json b/mobile-app/src/trans/aa.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/aa.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ach.json b/mobile-app/src/trans/ach.json
index 9aea44e354..d3198642f4 100644
--- a/mobile-app/src/trans/ach.json
+++ b/mobile-app/src/trans/ach.json
@@ -1,130 +1,130 @@
 {
-  "label_text_app_subtitle": "crwdns10:0crwdne10:0",
-  "label_button_facebook": "crwdns11:0crwdne11:0",
-  "label_button_google": "crwdns12:0crwdne12:0",
-  "label_button_try_app": "crwdns13:0crwdne13:0",
-  "label_button_acknowledge": "crwdns14:0crwdne14:0",
-  "label_button_cancel": "crwdns15:0crwdne15:0",
-  "label_button_continue": "crwdns16:0crwdne16:0",
-  "label_trash_status_threat": "crwdns17:0crwdne17:0",
-  "label_trash_status_regular": "crwdns18:0crwdne18:0",
-  "label_trash_status_cleaned": "crwdns19:0crwdne19:0",
-  "label_trash_status_outdated": "crwdns20:0crwdne20:0",
-  "label_trash_status_user": "crwdns21:0crwdne21:0",
-  "label_trash_status_change_location": "crwdns22:0crwdne22:0",
-  "label_trash_status_state_threat": "crwdns23:0crwdne23:0",
-  "label_trash_status_state_regular": "crwdns24:0crwdne24:0",
-  "label_trash_status_state_cleaned": "crwdns25:0crwdne25:0",
-  "label_trash_status_state_outdated": "crwdns26:0crwdne26:0",
-  "label_TP_created_date": "crwdns27:0crwdne27:0",
-  "label_TP_updated_date": "crwdns28:0crwdne28:0",
-  "label_TP_by": "crwdns29:0crwdne29:0",
-  "label_trash_amount_handful": "crwdns30:0crwdne30:0",
-  "label_trash_amount_bagful": "crwdns31:0crwdne31:0",
-  "label_trash_amount_cartloadl": "crwdns32:0crwdne32:0",
-  "label_trash_amount_truckload": "crwdns33:0crwdne33:0",
-  "label_trash_type_plastic": "crwdns34:0crwdne34:0",
-  "label_trash_type_metal": "crwdns35:0crwdne35:0",
-  "label_trash_type_glass": "crwdns36:0crwdne36:0",
-  "label_trash_type_electro": "crwdns37:0crwdne37:0",
-  "label_trash_type_paper": "crwdns38:0crwdne38:0",
-  "label_trash_type_tyres": "crwdns39:0crwdne39:0",
-  "label_trash_type_dom_waste": "crwdns40:0crwdne40:0",
-  "label_trash_type_furniture": "crwdns41:0crwdne41:0",
-  "label_trash_type_org_waste": "crwdns42:0crwdne42:0",
-  "label_header_tc": "crwdns43:0crwdne43:0",
-  "label_button_tc_agree": "crwdns44:0crwdne44:0",
-  "label_header_map": "crwdns45:0crwdne45:0",
-  "label_text_popover_subtitle": "crwdns46:0crwdne46:0",
-  "label_text_popover_text": "crwdns47:0crwdne47:0",
-  "label_header_activity": "crwdns48:0crwdne48:0",
-  "label_text_activity_empty_subtitle": "crwdns49:0crwdne49:0",
-  "label_text_activity_empty_text": "crwdns50:0crwdne50:0",
-  "label_text_activity_empty_hint": "crwdns51:0crwdne51:0",
-  "label_header_notific": "crwdns52:0crwdne52:0",
-  "label_text_notific_empty_subtitle": "crwdns53:0crwdne53:0",
-  "label_text_notific_empty_text": "crwdns54:0crwdne54:0",
-  "label_header_profile": "crwdns55:0crwdne55:0",
-  "label_header_settings": "crwdns56:0crwdne56:0",
-  "label_button_country_empty": "crwdns57:0crwdne57:0",
-  "label_text_country": "crwdns58:0crwdne58:0",
-  "label_header_select_country": "crwdns59:0crwdne59:0",
-  "label_text_select_country_hint": "crwdns60:0crwdne60:0",
-  "label_button_tc": "crwdns61:0crwdne61:0",
-  "label_button_logout": "crwdns62:0crwdne62:0",
-  "label_text_congrats_image": "crwdns63:0crwdne63:0",
-  "label_text_congrats_subtitle": "crwdns64:0crwdne64:0",
-  "label_text_congrats_text": "crwdns65:0crwdne65:0",
-  "label_header_createTP": "crwdns66:0crwdne66:0",
-  "label_button_createTP_editloc": "crwdns67:0crwdne67:0",
-  "label_header_edit_loc": "crwdns68:0crwdne68:0",
-  "label_button_edit_loc_set": "crwdns69:0crwdne69:0",
-  "label_text_createTP_status_subtitle": "crwdns70:0crwdne70:0",
-  "label_text_createTP_status_text": "crwdns71:0crwdne71:0",
-  "label_text_createTP_add_photos": "crwdns72:0crwdne72:0",
-  "label_text_createTP_select_amount": "crwdns73:0crwdne73:0",
-  "label_text_createTP_select_type": "crwdns74:0crwdne74:0",
-  "label_text_createTP_add_hashtags": "crwdns75:0crwdne75:0",
-  "label_text_createTP_add_hashtags_hint": "crwdns76:0crwdne76:0",
-  "label_button_createTP_confirm_create": "crwdns77:0crwdne77:0",
-  "label_alert_createTP_success": "crwdns78:0crwdne78:0",
-  "label_text_detailsTP_photos": "crwdns79:0crwdne79:0",
-  "label_text_detailsTP_amount": "crwdns80:0crwdne80:0",
-  "label_text_detailsTP_type": "crwdns81:0crwdne81:0",
-  "label_text_editTP_ask": "crwdns82:0crwdne82:0",
-  "label_text_editTP_letsconfirm": "crwdns83:0crwdne83:0",
-  "label_alert_editTP_confirm": "crwdns84:0crwdne84:0",
-  "label_text_editTP_letsedit": "crwdns85:0crwdne85:0",
-  "label_header_editTP": "crwdns86:0crwdne86:0",
-  "label_button_editTP_save": "crwdns87:0crwdne87:0",
-  "label_alert_editTP_edit": "crwdns88:0crwdne88:0",
-  "label_alert_editTP_delete": "crwdns89:0crwdne89:0",
-  "label_error_editTP_out_of_rng_subtitle": "crwdns90:0crwdne90:0",
-  "label_error_editTP_out_of_rng_text": "crwdns91:0crwdne91:0",
-  "label_error_saveTP_subtitle": "crwdns92:0crwdne92:0",
-  "label_error_saveTP_pic_and_type": "crwdns93:0crwdne93:0",
-  "label_error_saveTP_picture": "crwdns94:0crwdne94:0",
-  "label_error_saveTP_trash_type": "crwdns95:0crwdne95:0",
-  "label_error_change_loc_subtitle": "crwdns96:0crwdne96:0",
-  "label_error_change_loc_text": "crwdns97:0crwdne97:0",
-  "label_error_generic_error_subtitle": "crwdns98:0crwdne98:0",
-  "label_error_generic_error_text": "crwdns99:0crwdne99:0",
-  "label_error_network_subtitle": "crwdns100:0crwdne100:0",
-  "label_error_network_text": "crwdns101:0crwdne101:0",
-  "label_error_location_subtitle": "crwdns102:0crwdne102:0",
-  "label_error_location_text": "crwdns103:0crwdne103:0",
-  "label_error_loc_permission_text": "crwdns104:0crwdne104:0",
-  "label_trash_details_header": "crwdns105:0crwdne105:0",
-  "label_privacy_policy_header": "crwdns106:0crwdne106:0",
-  "label_about_header": "crwdns107:0crwdne107:0",
-  "label_edit_trashpoint_button": "crwdns108:0crwdne108:0",
-  "label_100m_limit_modal": "crwdns109:0crwdne109:0",
-  "label_retry_button": "crwdns110:0crwdne110:0",
-  "label_country_picker_placeholder": "crwdns111:0crwdne111:0",
-  "label_camera_permission_warning_ios": "crwdns112:0crwdne112:0",
-  "label_camera_permission_warning_android": "crwdns113:0crwdne113:0",
-  "label_camera_error_title": "crwdns114:0crwdne114:0",
-  "label_error_modal_default_title": "crwdns115:0crwdne115:0",
-  "label_error_modal_default_subtitle": "crwdns116:0crwdne116:0",
-  "label_location_permission_warning_ios": "crwdns117:0crwdne117:0",
-  "label_location_permission_warning_android": "crwdns118:0crwdne118:0",
-  "label_location_off_warning": "crwdns119:0crwdne119:0",
-  "label_location_modal_title": "crwdns120:0crwdne120:0",
-  "label_network_off_warning_title": "crwdns121:0crwdne121:0",
-  "label_network_off_warning": "crwdns122:0crwdne122:0",
-  "label_loading_image_text": "crwdns123:0crwdne123:0",
-  "label_loading_image_subtext": "crwdns124:0crwdne124:0",
-  "label_create_marker_missing_photos": "crwdns125:0crwdne125:0",
-  "label_edit_marker_missing_photos": "crwdns126:0crwdne126:0",
-  "label_confirm_marker_missing_photos": "crwdns127:0crwdne127:0",
-  "label_button_delete": "crwdns128:0crwdne128:0",
-  "label_delete_photo_title": "crwdns129:0crwdne129:0",
-  "label_delete_photo_subtitle": "crwdns130:0crwdne130:0",
-  "label_text_about_1": "crwdns131:0crwdne131:0",
-  "label_text_about_2": "crwdns132:0crwdne132:0",
-  "label_text_about_3": "crwdns133:0crwdne133:0",
-  "label_text_about_4": "crwdns136:0crwdne136:0",
-  "label_text_about_5": "crwdns137:0crwdne137:0",
-  "label_button_editTP_delete": "crwdns134:0crwdne134:0",
-  "label_locked_account_warning": "crwdns135:0crwdne135:0"
+  "label_text_app_subtitle": "crwdns28302:0crwdne28302:0",
+  "label_button_facebook": "crwdns28303:0crwdne28303:0",
+  "label_button_google": "crwdns28304:0crwdne28304:0",
+  "label_button_try_app": "crwdns28305:0crwdne28305:0",
+  "label_button_acknowledge": "crwdns28306:0crwdne28306:0",
+  "label_button_cancel": "crwdns28307:0crwdne28307:0",
+  "label_button_continue": "crwdns28308:0crwdne28308:0",
+  "label_trash_status_threat": "crwdns28309:0crwdne28309:0",
+  "label_trash_status_regular": "crwdns28310:0crwdne28310:0",
+  "label_trash_status_cleaned": "crwdns28311:0crwdne28311:0",
+  "label_trash_status_outdated": "crwdns28312:0crwdne28312:0",
+  "label_trash_status_user": "crwdns28313:0crwdne28313:0",
+  "label_trash_status_change_location": "crwdns28314:0crwdne28314:0",
+  "label_trash_status_state_threat": "crwdns28315:0crwdne28315:0",
+  "label_trash_status_state_regular": "crwdns28316:0crwdne28316:0",
+  "label_trash_status_state_cleaned": "crwdns28317:0crwdne28317:0",
+  "label_trash_status_state_outdated": "crwdns28318:0crwdne28318:0",
+  "label_TP_created_date": "crwdns28319:0crwdne28319:0",
+  "label_TP_updated_date": "crwdns28320:0crwdne28320:0",
+  "label_TP_by": "crwdns28321:0crwdne28321:0",
+  "label_trash_amount_handful": "crwdns28322:0crwdne28322:0",
+  "label_trash_amount_bagful": "crwdns28323:0crwdne28323:0",
+  "label_trash_amount_cartloadl": "crwdns28324:0crwdne28324:0",
+  "label_trash_amount_truckload": "crwdns28325:0crwdne28325:0",
+  "label_trash_type_plastic": "crwdns28326:0crwdne28326:0",
+  "label_trash_type_metal": "crwdns28327:0crwdne28327:0",
+  "label_trash_type_glass": "crwdns28328:0crwdne28328:0",
+  "label_trash_type_electro": "crwdns28329:0crwdne28329:0",
+  "label_trash_type_paper": "crwdns28330:0crwdne28330:0",
+  "label_trash_type_tyres": "crwdns28331:0crwdne28331:0",
+  "label_trash_type_dom_waste": "crwdns28332:0crwdne28332:0",
+  "label_trash_type_furniture": "crwdns28333:0crwdne28333:0",
+  "label_trash_type_org_waste": "crwdns28334:0crwdne28334:0",
+  "label_header_tc": "crwdns28335:0crwdne28335:0",
+  "label_button_tc_agree": "crwdns28336:0crwdne28336:0",
+  "label_header_map": "crwdns28337:0crwdne28337:0",
+  "label_text_popover_subtitle": "crwdns28338:0crwdne28338:0",
+  "label_text_popover_text": "crwdns28339:0crwdne28339:0",
+  "label_header_activity": "crwdns28340:0crwdne28340:0",
+  "label_text_activity_empty_subtitle": "crwdns28341:0crwdne28341:0",
+  "label_text_activity_empty_text": "crwdns28342:0crwdne28342:0",
+  "label_text_activity_empty_hint": "crwdns28343:0crwdne28343:0",
+  "label_header_notific": "crwdns28344:0crwdne28344:0",
+  "label_text_notific_empty_subtitle": "crwdns28345:0crwdne28345:0",
+  "label_text_notific_empty_text": "crwdns28346:0crwdne28346:0",
+  "label_header_profile": "crwdns28347:0crwdne28347:0",
+  "label_header_settings": "crwdns28348:0crwdne28348:0",
+  "label_button_country_empty": "crwdns28349:0crwdne28349:0",
+  "label_text_country": "crwdns28350:0crwdne28350:0",
+  "label_header_select_country": "crwdns28351:0crwdne28351:0",
+  "label_text_select_country_hint": "crwdns28352:0crwdne28352:0",
+  "label_button_tc": "crwdns28353:0crwdne28353:0",
+  "label_button_logout": "crwdns28354:0crwdne28354:0",
+  "label_text_congrats_image": "crwdns28355:0crwdne28355:0",
+  "label_text_congrats_subtitle": "crwdns28356:0crwdne28356:0",
+  "label_text_congrats_text": "crwdns28357:0crwdne28357:0",
+  "label_header_createTP": "crwdns28358:0crwdne28358:0",
+  "label_button_createTP_editloc": "crwdns28359:0crwdne28359:0",
+  "label_header_edit_loc": "crwdns28360:0crwdne28360:0",
+  "label_button_edit_loc_set": "crwdns28361:0crwdne28361:0",
+  "label_text_createTP_status_subtitle": "crwdns28362:0crwdne28362:0",
+  "label_text_createTP_status_text": "crwdns28363:0crwdne28363:0",
+  "label_text_createTP_add_photos": "crwdns28364:0crwdne28364:0",
+  "label_text_createTP_select_amount": "crwdns28365:0crwdne28365:0",
+  "label_text_createTP_select_type": "crwdns28366:0crwdne28366:0",
+  "label_text_createTP_add_hashtags": "crwdns28367:0crwdne28367:0",
+  "label_text_createTP_add_hashtags_hint": "crwdns28368:0crwdne28368:0",
+  "label_button_createTP_confirm_create": "crwdns28369:0crwdne28369:0",
+  "label_alert_createTP_success": "crwdns28370:0crwdne28370:0",
+  "label_text_detailsTP_photos": "crwdns28371:0crwdne28371:0",
+  "label_text_detailsTP_amount": "crwdns28372:0crwdne28372:0",
+  "label_text_detailsTP_type": "crwdns28373:0crwdne28373:0",
+  "label_text_editTP_ask": "crwdns28374:0crwdne28374:0",
+  "label_text_editTP_letsconfirm": "crwdns28375:0crwdne28375:0",
+  "label_alert_editTP_confirm": "crwdns28376:0crwdne28376:0",
+  "label_text_editTP_letsedit": "crwdns28377:0crwdne28377:0",
+  "label_header_editTP": "crwdns28378:0crwdne28378:0",
+  "label_button_editTP_save": "crwdns28379:0crwdne28379:0",
+  "label_alert_editTP_edit": "crwdns28380:0crwdne28380:0",
+  "label_alert_editTP_delete": "crwdns28381:0crwdne28381:0",
+  "label_error_editTP_out_of_rng_subtitle": "crwdns28382:0crwdne28382:0",
+  "label_error_editTP_out_of_rng_text": "crwdns28383:0crwdne28383:0",
+  "label_error_saveTP_subtitle": "crwdns28384:0crwdne28384:0",
+  "label_error_saveTP_pic_and_type": "crwdns28385:0crwdne28385:0",
+  "label_error_saveTP_picture": "crwdns28386:0crwdne28386:0",
+  "label_error_saveTP_trash_type": "crwdns28387:0crwdne28387:0",
+  "label_error_change_loc_subtitle": "crwdns28388:0crwdne28388:0",
+  "label_error_change_loc_text": "crwdns28389:0crwdne28389:0",
+  "label_error_generic_error_subtitle": "crwdns28390:0crwdne28390:0",
+  "label_error_generic_error_text": "crwdns28391:0crwdne28391:0",
+  "label_error_network_subtitle": "crwdns28392:0crwdne28392:0",
+  "label_error_network_text": "crwdns28393:0crwdne28393:0",
+  "label_error_location_subtitle": "crwdns28394:0crwdne28394:0",
+  "label_error_location_text": "crwdns28395:0crwdne28395:0",
+  "label_error_loc_permission_text": "crwdns28396:0crwdne28396:0",
+  "label_trash_details_header": "crwdns28397:0crwdne28397:0",
+  "label_privacy_policy_header": "crwdns28398:0crwdne28398:0",
+  "label_about_header": "crwdns28399:0crwdne28399:0",
+  "label_edit_trashpoint_button": "crwdns28400:0crwdne28400:0",
+  "label_100m_limit_modal": "crwdns28401:0crwdne28401:0",
+  "label_retry_button": "crwdns28402:0crwdne28402:0",
+  "label_country_picker_placeholder": "crwdns28403:0crwdne28403:0",
+  "label_camera_permission_warning_ios": "crwdns28404:0crwdne28404:0",
+  "label_camera_permission_warning_android": "crwdns28405:0crwdne28405:0",
+  "label_camera_error_title": "crwdns28406:0crwdne28406:0",
+  "label_error_modal_default_title": "crwdns28407:0crwdne28407:0",
+  "label_error_modal_default_subtitle": "crwdns28408:0crwdne28408:0",
+  "label_location_permission_warning_ios": "crwdns28409:0crwdne28409:0",
+  "label_location_permission_warning_android": "crwdns28410:0crwdne28410:0",
+  "label_location_off_warning": "crwdns28411:0crwdne28411:0",
+  "label_location_modal_title": "crwdns28412:0crwdne28412:0",
+  "label_network_off_warning_title": "crwdns28413:0crwdne28413:0",
+  "label_network_off_warning": "crwdns28414:0crwdne28414:0",
+  "label_loading_image_text": "crwdns28415:0crwdne28415:0",
+  "label_loading_image_subtext": "crwdns28416:0crwdne28416:0",
+  "label_create_marker_missing_photos": "crwdns28417:0crwdne28417:0",
+  "label_edit_marker_missing_photos": "crwdns28418:0crwdne28418:0",
+  "label_confirm_marker_missing_photos": "crwdns28419:0crwdne28419:0",
+  "label_button_delete": "crwdns28420:0crwdne28420:0",
+  "label_delete_photo_title": "crwdns28421:0crwdne28421:0",
+  "label_delete_photo_subtitle": "crwdns28422:0crwdne28422:0",
+  "label_text_about_1": "crwdns28423:0crwdne28423:0",
+  "label_text_about_2": "crwdns28424:0crwdne28424:0",
+  "label_text_about_3": "crwdns28425:0crwdne28425:0",
+  "label_text_about_4": "crwdns28426:0crwdne28426:0",
+  "label_text_about_5": "crwdns28427:0crwdne28427:0",
+  "label_button_editTP_delete": "crwdns28428:0crwdne28428:0",
+  "label_locked_account_warning": "crwdns28429:0crwdne28429:0"
 }
\ No newline at end of file
diff --git a/mobile-app/src/trans/ae.json b/mobile-app/src/trans/ae.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ae.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ak.json b/mobile-app/src/trans/ak.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ak.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/am.json b/mobile-app/src/trans/am.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/am.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/an.json b/mobile-app/src/trans/an.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/an.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ar.json b/mobile-app/src/trans/ar.json
index 57d94d6a11..c449f4e51c 100644
--- a/mobile-app/src/trans/ar.json
+++ b/mobile-app/src/trans/ar.json
@@ -108,10 +108,10 @@
   "label_error_modal_default_subtitle": "هناك خطأ في السيرفر الخادم!",
   "label_location_permission_warning_ios": "يجب تغيير إعدادات الموقع. للقيام بذلك، انتقل إلى إعدادات> الخصوصية> خدمات الموقع.",
   "label_location_permission_warning_android": "يجب تغيير إعدادات الموقع. للقيام بذلك، انتقل إلى إعدادات> تطبيقات.",
-  "label_location_off_warning": "إعدادات الموقع مغلقة. من فضلك قم بفتحها من خلال إعدادات الموقع (GPS) ليمكنك استخدام التطبيق.",
+  "label_location_off_warning": "خدمات الموقع مغلقة. من فضلك قم بفتحها من إعدادات تحديد المواقع (GPS) لتستخدم التطبيق.",
   "label_location_modal_title": "قم بتمكين الموقع",
   "label_network_off_warning_title": "لا يوجد اتصال بشبكة الانترنت",
-  "label_network_off_warning": "تم تعطيل بيانات الإنترنت. يمكنك تمكين بيانات الجوال أو توصيل هاتفك بشبكة واي-في لاستخدام التطبيق.",
+  "label_network_off_warning": "تم تعطيل بيانات الجوال. يمكنك تمكين بيانات الجوال أو توصيل هاتفك بشبكة واي-في لاستخدام التطبيق.",
   "label_loading_image_text": "باقي قليل...",
   "label_loading_image_subtext": "فضلاً انتظر حتى نتمكن من حفظ مجهودك.",
   "label_create_marker_missing_photos": "تعذر تحميل الصور. الرجاء محاولة إضافتها مرة أخرى.",
diff --git a/mobile-app/src/trans/arn.json b/mobile-app/src/trans/arn.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/arn.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/as.json b/mobile-app/src/trans/as.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/as.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ast.json b/mobile-app/src/trans/ast.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ast.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/av.json b/mobile-app/src/trans/av.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/av.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/az.json b/mobile-app/src/trans/az.json
new file mode 100644
index 0000000000..f7e3c44c46
--- /dev/null
+++ b/mobile-app/src/trans/az.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "xərçəng",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "plastik",
+  "label_trash_type_metal": "metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Xəritə",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "mənim profilim",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "ölkə",
+  "label_text_country": "ölkə",
+  "label_header_select_country": "ölkəni seçmək",
+  "label_text_select_country_hint": "axtar",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "haqqında",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Ölkənizi seçin",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "silmək",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ba.json b/mobile-app/src/trans/ba.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ba.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/bal.json b/mobile-app/src/trans/bal.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/bal.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ban.json b/mobile-app/src/trans/ban.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ban.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/be.json b/mobile-app/src/trans/be.json
index 78344189bc..07340bc047 100644
--- a/mobile-app/src/trans/be.json
+++ b/mobile-app/src/trans/be.json
@@ -1,130 +1,130 @@
 {
-  "label_text_app_subtitle": "Let's clean up the world together!",
-  "label_button_facebook": "Continue with Facebook",
-  "label_button_google": "Continue with Google",
-  "label_button_try_app": "Try out the app without account",
-  "label_button_acknowledge": "Ok, got it!",
-  "label_button_cancel": "Cancel",
-  "label_button_continue": "Continue",
-  "label_trash_status_threat": "threat",
-  "label_trash_status_regular": "regular",
-  "label_trash_status_cleaned": "cleaned",
-  "label_trash_status_outdated": "outdated",
-  "label_trash_status_user": "user",
-  "label_trash_status_change_location": "changeLocation",
-  "label_trash_status_state_threat": "This point is a threat!",
-  "label_trash_status_state_regular": "This is a regular trashpoint.",
-  "label_trash_status_state_cleaned": "This point is cleaned!",
-  "label_trash_status_state_outdated": "This point is outdated!",
-  "label_TP_created_date": "Created",
-  "label_TP_updated_date": "Updated",
-  "label_TP_by": " by ",
-  "label_trash_amount_handful": "handful",
-  "label_trash_amount_bagful": "bagful",
-  "label_trash_amount_cartloadl": "cartload",
-  "label_trash_amount_truckload": "truckload",
-  "label_trash_type_plastic": "Plastic",
-  "label_trash_type_metal": "Metal",
-  "label_trash_type_glass": "Glass",
-  "label_trash_type_electro": "Electronics",
-  "label_trash_type_paper": "Paper/Wood",
-  "label_trash_type_tyres": "Tyres",
-  "label_trash_type_dom_waste": "Domestic waste",
-  "label_trash_type_furniture": "Furniture",
-  "label_trash_type_org_waste": "Organic waste",
-  "label_header_tc": "Terms and Conditions",
-  "label_button_tc_agree": "I agree with the Terms & Conditions",
-  "label_header_map": "Map",
-  "label_text_popover_subtitle": "Join other people who are mapping trash!",
-  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
-  "label_header_activity": "My activity",
-  "label_text_activity_empty_subtitle": "Nothing to see here!",
-  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
-  "label_text_activity_empty_hint": "Add a trashpoint!",
-  "label_header_notific": "Notifications",
-  "label_text_notific_empty_subtitle": "Nothing to see here!",
-  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
-  "label_header_profile": "My profile",
-  "label_header_settings": "Account settings",
-  "label_button_country_empty": "Country",
-  "label_text_country": "Country",
-  "label_header_select_country": "Select a country",
-  "label_text_select_country_hint": "Search",
-  "label_button_tc": "Terms and Conditions",
-  "label_button_logout": "Log out",
-  "label_text_congrats_image": "Trash captured",
-  "label_text_congrats_subtitle": "Great job!",
-  "label_text_congrats_text": "Now save the point by verifying the data.",
-  "label_header_createTP": "Create a trashpoint",
-  "label_button_createTP_editloc": "Edit location",
-  "label_header_edit_loc": "Edit location",
-  "label_button_edit_loc_set": "Set trashpoint location",
-  "label_text_createTP_status_subtitle": "Point status",
-  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
-  "label_text_createTP_add_photos": "Add trash photos",
-  "label_text_createTP_select_amount": "Select trash amount",
-  "label_text_createTP_select_type": "Select trash type",
-  "label_text_createTP_add_hashtags": "Additional added tags",
-  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
-  "label_button_createTP_confirm_create": "Create trashpoint",
-  "label_alert_createTP_success": "Trashpoint successfully created",
-  "label_text_detailsTP_photos": "Trash photos",
-  "label_text_detailsTP_amount": "Trash amount",
-  "label_text_detailsTP_type": "Trash type",
-  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
-  "label_text_editTP_letsconfirm": "Yes, I confirm",
-  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
-  "label_text_editTP_letsedit": "No, let's edit",
-  "label_header_editTP": "Edit a trashpoint",
-  "label_button_editTP_save": "Save trashpoint changes",
-  "label_alert_editTP_edit": "Trashpoint successfully updated",
-  "label_alert_editTP_delete": "Trashpoint successfully deleted",
-  "label_error_editTP_out_of_rng_subtitle": "Out of range",
-  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
-  "label_error_saveTP_subtitle": "Save trashpoint",
-  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
-  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
-  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
-  "label_error_change_loc_subtitle": "Out of bounds",
-  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
-  "label_error_generic_error_subtitle": "Out of bounds",
-  "label_error_generic_error_text": "There was an error on the server.",
-  "label_error_network_subtitle": "No network connection",
-  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_error_location_subtitle": "Enable location",
-  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
-  "label_trash_details_header": "Trashpoint details",
-  "label_privacy_policy_header": "Privacy Policy",
-  "label_about_header": "About",
-  "label_edit_trashpoint_button": "Edit trashpoint",
-  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
-  "label_retry_button": "Retry",
-  "label_country_picker_placeholder": "Choose your country",
-  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
-  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
-  "label_camera_error_title": "Camera Access Denied",
-  "label_error_modal_default_title": "Oh noes!",
-  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
-  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
-  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
-  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_location_modal_title": "Enable location",
-  "label_network_off_warning_title": "No network connection",
-  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_loading_image_text": "Almost there...",
-  "label_loading_image_subtext": "Please wait while we save your actions.",
-  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_button_delete": "Delete",
-  "label_delete_photo_title": "Delete photo",
-  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
-  "label_text_about_1": "This app is an initiative by Let's Do It World",
-  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
-  "label_text_about_3": "This app is a joint cooperation with",
-  "label_text_about_4": "Estonian product, sponsored by the country and government",
-  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
-  "label_button_editTP_delete": "Delete trashpoint",
-  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+  "label_text_app_subtitle": "Зробім свет чысцейшы разам!",
+  "label_button_facebook": "Працягнуць праз Facebook",
+  "label_button_google": "Працягнуць праз Google",
+  "label_button_try_app": "Паспрабуйце праграму без ўліковага запісу",
+  "label_button_acknowledge": "Добра, зразумеў!",
+  "label_button_cancel": "Адмяніць",
+  "label_button_continue": "Працягваць",
+  "label_trash_status_threat": "пагроза",
+  "label_trash_status_regular": "звычайны",
+  "label_trash_status_cleaned": "ачышчана",
+  "label_trash_status_outdated": "састарэла",
+  "label_trash_status_user": "карыстальнік",
+  "label_trash_status_change_location": "змяніцьМесцазнаходжанне",
+  "label_trash_status_state_threat": "Гэтая кропка небяспечная!",
+  "label_trash_status_state_regular": "Гэта звычайнае месца збору смецця.",
+  "label_trash_status_state_cleaned": "Гэтае месца ачышчана!",
+  "label_trash_status_state_outdated": "Гэтае месца састарэла!",
+  "label_TP_created_date": "Створана",
+  "label_TP_updated_date": "Абноўлена",
+  "label_TP_by": " па ",
+  "label_trash_amount_handful": "жменю",
+  "label_trash_amount_bagful": "поўны мех",
+  "label_trash_amount_cartloadl": "воз",
+  "label_trash_amount_truckload": "грузавік",
+  "label_trash_type_plastic": "Пластык",
+  "label_trash_type_metal": "Метал",
+  "label_trash_type_glass": "Шкло",
+  "label_trash_type_electro": "Электроніка",
+  "label_trash_type_paper": "Папера/Дрэва",
+  "label_trash_type_tyres": "Шыны",
+  "label_trash_type_dom_waste": "Побытавыя адыходы",
+  "label_trash_type_furniture": "Мэбля",
+  "label_trash_type_org_waste": "Арганічныя адыходы",
+  "label_header_tc": "Правілы ды Умовы",
+  "label_button_tc_agree": "Я пагаджаюся з Правіламі & Умовамі",
+  "label_header_map": "Мапа",
+  "label_text_popover_subtitle": "Далучайцеся да іншых людзей, якія пазначаюць смецце на мапе!",
+  "label_text_popover_text": "Пачніце пазначаць засмечаныя мясціны, каб зрабіць вашу супольнасць чысцей і здаравей.",
+  "label_header_activity": "Мая дзейнасць",
+  "label_text_activity_empty_subtitle": "Тут нічога не відно!",
+  "label_text_activity_empty_text": "Вы яшчэ не дадалі ніводнага засмечанага месца. Калі вы гэта зробіце, то яны будуць адлюстраваныя тут.",
+  "label_text_activity_empty_hint": "Дадаць засмечанае месца!",
+  "label_header_notific": "Апавяшчэнні",
+  "label_text_notific_empty_subtitle": "Тут нічога не відно!",
+  "label_text_notific_empty_text": "Пакуль мы не бачылі якіх-небудзь прыходзячых апавяшчэнняў, але мы дамо вам ведаць, калі атрымаем іх!",
+  "label_header_profile": "Мой профіль",
+  "label_header_settings": "Налады акаўнта",
+  "label_button_country_empty": "Краіна",
+  "label_text_country": "Краіна",
+  "label_header_select_country": "Абраць краіну",
+  "label_text_select_country_hint": "Пошук",
+  "label_button_tc": "Правілы ды Умовы",
+  "label_button_logout": "Выйсці",
+  "label_text_congrats_image": "Смецце сабрана",
+  "label_text_congrats_subtitle": "Выдатная праца!",
+  "label_text_congrats_text": "Зараз захаваеце кропку, праверыўшы дадзеныя.",
+  "label_header_createTP": "Стварыць засмечаную кропку",
+  "label_button_createTP_editloc": "Змяніць месцазнаходжанне",
+  "label_header_edit_loc": "Змяніць месцазнаходжанне",
+  "label_button_edit_loc_set": "Устанавіць засмечаную кропку",
+  "label_text_createTP_status_subtitle": "Статус кропкі",
+  "label_text_createTP_status_text": "Калі неабходна хуткае дзеянне (таксічныя цяжкія металы), калі ласка, пазначце як пагрозу.",
+  "label_text_createTP_add_photos": "Дадаць фотаздымкі смецця",
+  "label_text_createTP_select_amount": "Абярыце колькасць смецця",
+  "label_text_createTP_select_type": "Абярыце тып смецця",
+  "label_text_createTP_add_hashtags": "Дадатковыя дададзеныя тэгі",
+  "label_text_createTP_add_hashtags_hint": "напрыклад #назвабрэнду, #бляшанкі",
+  "label_button_createTP_confirm_create": "Стварыць засмечанае месца",
+  "label_alert_createTP_success": "Засмечаная кропка паспяхова створана",
+  "label_text_detailsTP_photos": "Фотаздымкі смецця",
+  "label_text_detailsTP_amount": "Колькасць смецця",
+  "label_text_detailsTP_type": "Тып смецця",
+  "label_text_editTP_ask": "Ці з'яўляецца інфармацыя пра гэтае засмечанае месца яшчэ правільнай і да цяперашняга часу?",
+  "label_text_editTP_letsconfirm": "Так, я пацвярджаю",
+  "label_alert_editTP_confirm": "Засмечанае месца паспяхова пацверджана",
+  "label_text_editTP_letsedit": "Не, давайце рэдагаваць",
+  "label_header_editTP": "Рэдагаваць засмечаную кропку",
+  "label_button_editTP_save": "Захаваць змены пра засмечанае месца",
+  "label_alert_editTP_edit": "Засмечанае месца паспяхова абноўлена",
+  "label_alert_editTP_delete": "Засмечанае месца паспяхова выдалена",
+  "label_error_editTP_out_of_rng_subtitle": "Па-за зонаю дасяжнасці",
+  "label_error_editTP_out_of_rng_text": "Кропку можна змяняць толькі, калі вы знаходзіцеся ў межах 100 метраў ад яе.",
+  "label_error_saveTP_subtitle": "Захаваць засмечаную кропку",
+  "label_error_saveTP_pic_and_type": "Для нас больш карысна, калі вы зробіце хаця б адну выяву засмечанага месца ды ўсталюеце тып смецця.",
+  "label_error_saveTP_picture": "Для нас больш карысна, калі вы зробіце хаця б адну выяву засмечанай кропкі перад захаваннем.",
+  "label_error_saveTP_trash_type": "Для нас больш карысна, калі вы ўсталюеце тып засмечанага месца перад захаваннем.",
+  "label_error_change_loc_subtitle": "Па-за межамі",
+  "label_error_change_loc_text": "Калі ласка, змесціце кропку ў межах 100 метраў ад вашага месцазнаходжання.",
+  "label_error_generic_error_subtitle": "Па-за межамі",
+  "label_error_generic_error_text": "Была памылка на серверы.",
+  "label_error_network_subtitle": "Няма падлучэння да сеткі",
+  "label_error_network_text": "Перадача мабільных дадзеных адключаная. Уключыць перадачу мабільных дадзеных або падключыць тэлефон да Wi-Fi, каб выкарыстоўваць праграму.",
+  "label_error_location_subtitle": "Уключыць месцазнаходжанне",
+  "label_error_location_text": "Сервісы вызначэння месцазнаходжання адключаныя. Калі ласка, уключыце ваш GPS у наладах, каб выкарыстоўваць праграму.",
+  "label_error_loc_permission_text": "Вы забаранілі сервісы вызначэння месцазнаходжання. Калі ласка, дазвольце ім для таго, каб выкарыстоўваць праграму.",
+  "label_trash_details_header": "Падрабязнасці пра засмечаную кропку",
+  "label_privacy_policy_header": "Палітыка прыватнасці",
+  "label_about_header": "Пра",
+  "label_edit_trashpoint_button": "Рэдагаваць засмечанае месца",
+  "label_100m_limit_modal": "Кропку можна рэдагаваць толькі, калі вы знаходзіцеся ў межах 100 метраў ад яе.",
+  "label_retry_button": "Паўтарыць спробу",
+  "label_country_picker_placeholder": "Абярыце сваю краіну",
+  "label_camera_permission_warning_ios": "Вы павінны змяніць правы доступу да камеры. Для гэтага, перайдзіце ў раздзел Налады> Канфідэнцыйнасць> Камера",
+  "label_camera_permission_warning_android": "Вы павінны змяніць правы доступу да камеры. Для гэтага, перайдзіце ў раздзел Налады> Праграмы",
+  "label_camera_error_title": "Забаронены доступ да камеры",
+  "label_error_modal_default_title": "О, не!",
+  "label_error_modal_default_subtitle": "Выяўлена памылка сервера!",
+  "label_location_permission_warning_ios": "Вы павінны змяніць дазвол месцазнаходжання. Для гэтага, перайдзіце ў раздзел Налады> Канфідэнцыйнасць> Вызначэнне месцазнаходжання.",
+  "label_location_permission_warning_android": "Вы павінны змяніць дазвол месцазнаходжання. Для гэтага, перайдзіце ў раздзел Налады> Праграмы.",
+  "label_location_off_warning": "Сервісы вызначэння месцазнаходжання адключаныя. Калі ласка, уключыце ваш GPS у наладах, каб выкарыстоўваць праграму.",
+  "label_location_modal_title": "Уключыць месцазнаходжанне",
+  "label_network_off_warning_title": "Няма падлучэння да сеткі",
+  "label_network_off_warning": "Перадача мабільных дадзеных адключаная. Уключыць перадачу мабільных дадзеных або падключыць тэлефон да Wi-Fi, каб выкарыстоўваць праграму.",
+  "label_loading_image_text": "Амаль там...",
+  "label_loading_image_subtext": "Пачакайце, пакуль мы захаваем вашыя дзеянні.",
+  "label_create_marker_missing_photos": "Фотаздымкі маркера не могуць быць загружаны. Калі ласка, паспрабуйце дадаць іх зноў.",
+  "label_edit_marker_missing_photos": "Фотаздымкі маркера не могуць быць загружаны. Калі ласка, паспрабуйце дадаць іх зноў.",
+  "label_confirm_marker_missing_photos": "Фотаздымкі маркера не могуць быць загружаны. Калі ласка, паспрабуйце дадаць іх зноў.",
+  "label_button_delete": "Выдаліць",
+  "label_delete_photo_title": "Выдаліць фота",
+  "label_delete_photo_subtitle": "Вы упэўнены, што жадаеце выдаліць фота? Гэтае дзеянне нельга адмяніць.",
+  "label_text_about_1": "Гэтая праграма створана па ініцыятыве Let's Do It World",
+  "label_text_about_2": "Усе дадзеныя, сабраныя карыстальнікамі па ўсім свеце, будуць візуалізаваны ў глабальнай карце смецця. каб пачаць расчыстку па ўсім свеце з нагоды Сусветнага дня Прыбірання, 15 верасня 2018",
+  "label_text_about_3": "Гэта праграма створана супольна з",
+  "label_text_about_4": "Эстонскі прадукт, створаны пры падтрымцы краіны ды ураду",
+  "label_text_about_5": "Фундатары: Міністэрства аховы навакольнага асяроддзя Эстоніі, Міністэрства замежных спраў Эстонскай Рэспублікі, праграма \"Эстонскай Рэспубліцы 100\"",
+  "label_button_editTP_delete": "Выдаліць засмечаную кропку",
+  "label_locked_account_warning": "Ваш акаўнт заблакаваны. За падрабязнасцямі звярніцеся да адміністратара."
 }
\ No newline at end of file
diff --git a/mobile-app/src/trans/ber.json b/mobile-app/src/trans/ber.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ber.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/bfo.json b/mobile-app/src/trans/bfo.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/bfo.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/bg.json b/mobile-app/src/trans/bg.json
index 78344189bc..2c9357d1f0 100644
--- a/mobile-app/src/trans/bg.json
+++ b/mobile-app/src/trans/bg.json
@@ -1,85 +1,85 @@
 {
-  "label_text_app_subtitle": "Let's clean up the world together!",
-  "label_button_facebook": "Continue with Facebook",
-  "label_button_google": "Continue with Google",
+  "label_text_app_subtitle": "Нека почистим света заедно!",
+  "label_button_facebook": "Продължаване с Facebook",
+  "label_button_google": "Продължаване с Google",
   "label_button_try_app": "Try out the app without account",
-  "label_button_acknowledge": "Ok, got it!",
-  "label_button_cancel": "Cancel",
-  "label_button_continue": "Continue",
+  "label_button_acknowledge": "Добре, схванах!",
+  "label_button_cancel": "Отказ",
+  "label_button_continue": "Продължаване",
   "label_trash_status_threat": "threat",
   "label_trash_status_regular": "regular",
-  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_cleaned": "изчистено",
   "label_trash_status_outdated": "outdated",
-  "label_trash_status_user": "user",
+  "label_trash_status_user": "потребител",
   "label_trash_status_change_location": "changeLocation",
   "label_trash_status_state_threat": "This point is a threat!",
   "label_trash_status_state_regular": "This is a regular trashpoint.",
-  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_cleaned": "Тази точка е почистена!",
   "label_trash_status_state_outdated": "This point is outdated!",
-  "label_TP_created_date": "Created",
-  "label_TP_updated_date": "Updated",
-  "label_TP_by": " by ",
+  "label_TP_created_date": "Създадено",
+  "label_TP_updated_date": "Осъвременено",
+  "label_TP_by": " от ",
   "label_trash_amount_handful": "handful",
   "label_trash_amount_bagful": "bagful",
   "label_trash_amount_cartloadl": "cartload",
   "label_trash_amount_truckload": "truckload",
-  "label_trash_type_plastic": "Plastic",
-  "label_trash_type_metal": "Metal",
-  "label_trash_type_glass": "Glass",
-  "label_trash_type_electro": "Electronics",
-  "label_trash_type_paper": "Paper/Wood",
-  "label_trash_type_tyres": "Tyres",
-  "label_trash_type_dom_waste": "Domestic waste",
-  "label_trash_type_furniture": "Furniture",
-  "label_trash_type_org_waste": "Organic waste",
-  "label_header_tc": "Terms and Conditions",
-  "label_button_tc_agree": "I agree with the Terms & Conditions",
-  "label_header_map": "Map",
+  "label_trash_type_plastic": "Пластмаса",
+  "label_trash_type_metal": "Метал",
+  "label_trash_type_glass": "Стъкло",
+  "label_trash_type_electro": "Електроника",
+  "label_trash_type_paper": "Хартия/дърво",
+  "label_trash_type_tyres": "Гуми",
+  "label_trash_type_dom_waste": "Битови отпадъци",
+  "label_trash_type_furniture": "Мебели",
+  "label_trash_type_org_waste": "Органични отпадъци",
+  "label_header_tc": "Правила и условия",
+  "label_button_tc_agree": "Съгласявам се с правилата и условията",
+  "label_header_map": "Карта",
   "label_text_popover_subtitle": "Join other people who are mapping trash!",
   "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
-  "label_header_activity": "My activity",
-  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_header_activity": "Моята дейност",
+  "label_text_activity_empty_subtitle": "Няма какво да видите тук!",
   "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
   "label_text_activity_empty_hint": "Add a trashpoint!",
-  "label_header_notific": "Notifications",
-  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_header_notific": "Известия",
+  "label_text_notific_empty_subtitle": "Няма какво да видите тук!",
   "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
-  "label_header_profile": "My profile",
-  "label_header_settings": "Account settings",
-  "label_button_country_empty": "Country",
-  "label_text_country": "Country",
-  "label_header_select_country": "Select a country",
-  "label_text_select_country_hint": "Search",
-  "label_button_tc": "Terms and Conditions",
-  "label_button_logout": "Log out",
+  "label_header_profile": "Моят профил",
+  "label_header_settings": "Настройки на акаунта",
+  "label_button_country_empty": "Държава",
+  "label_text_country": "Държава",
+  "label_header_select_country": "Изберете държава",
+  "label_text_select_country_hint": "Търсене",
+  "label_button_tc": "Правила и условия",
+  "label_button_logout": "Изход",
   "label_text_congrats_image": "Trash captured",
-  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_subtitle": "Страхотна работа!",
   "label_text_congrats_text": "Now save the point by verifying the data.",
   "label_header_createTP": "Create a trashpoint",
-  "label_button_createTP_editloc": "Edit location",
-  "label_header_edit_loc": "Edit location",
+  "label_button_createTP_editloc": "Редактиране на местоположението",
+  "label_header_edit_loc": "Редактиране на местоположението",
   "label_button_edit_loc_set": "Set trashpoint location",
-  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_subtitle": "Състояние на точката",
   "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
-  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_add_photos": "Добавяне на снимки с боклуци",
   "label_text_createTP_select_amount": "Select trash amount",
-  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_select_type": "Изберете вид боклук",
   "label_text_createTP_add_hashtags": "Additional added tags",
   "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
   "label_button_createTP_confirm_create": "Create trashpoint",
   "label_alert_createTP_success": "Trashpoint successfully created",
-  "label_text_detailsTP_photos": "Trash photos",
-  "label_text_detailsTP_amount": "Trash amount",
-  "label_text_detailsTP_type": "Trash type",
+  "label_text_detailsTP_photos": "Снимки с боклуци",
+  "label_text_detailsTP_amount": "Количество смет",
+  "label_text_detailsTP_type": "Вид отпадъци",
   "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
-  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_text_editTP_letsconfirm": "Да, потвърждавам",
   "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
-  "label_text_editTP_letsedit": "No, let's edit",
+  "label_text_editTP_letsedit": "Не, нека редактирам",
   "label_header_editTP": "Edit a trashpoint",
   "label_button_editTP_save": "Save trashpoint changes",
   "label_alert_editTP_edit": "Trashpoint successfully updated",
   "label_alert_editTP_delete": "Trashpoint successfully deleted",
-  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_subtitle": "Извън обхват",
   "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
   "label_error_saveTP_subtitle": "Save trashpoint",
   "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
@@ -91,34 +91,34 @@
   "label_error_generic_error_text": "There was an error on the server.",
   "label_error_network_subtitle": "No network connection",
   "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_error_location_subtitle": "Enable location",
+  "label_error_location_subtitle": "Позволение определянето на местоположение",
   "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
   "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
   "label_trash_details_header": "Trashpoint details",
-  "label_privacy_policy_header": "Privacy Policy",
-  "label_about_header": "About",
+  "label_privacy_policy_header": "Политика за поверителност",
+  "label_about_header": "Инфо",
   "label_edit_trashpoint_button": "Edit trashpoint",
   "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
-  "label_retry_button": "Retry",
-  "label_country_picker_placeholder": "Choose your country",
+  "label_retry_button": "Опитване пак",
+  "label_country_picker_placeholder": "Изберете държавата си",
   "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
   "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
-  "label_camera_error_title": "Camera Access Denied",
-  "label_error_modal_default_title": "Oh noes!",
+  "label_camera_error_title": "Отказан е достъп до камерата",
+  "label_error_modal_default_title": "О, не!",
   "label_error_modal_default_subtitle": "The fail whale detected a server error!",
   "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
   "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
   "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_location_modal_title": "Enable location",
+  "label_location_modal_title": "Позволение определянето на местоположение",
   "label_network_off_warning_title": "No network connection",
   "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_loading_image_text": "Almost there...",
-  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_loading_image_text": "Почти там...",
+  "label_loading_image_subtext": "Почакайте, докато записваме действията ви.",
   "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
   "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
   "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_button_delete": "Delete",
-  "label_delete_photo_title": "Delete photo",
+  "label_button_delete": "Изтриване",
+  "label_delete_photo_title": "Изтриване на снимката",
   "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
   "label_text_about_1": "This app is an initiative by Let's Do It World",
   "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
@@ -126,5 +126,5 @@
   "label_text_about_4": "Estonian product, sponsored by the country and government",
   "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
   "label_button_editTP_delete": "Delete trashpoint",
-  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+  "label_locked_account_warning": "Вашият акаунт е заключен. За подробности се свържете с администратора."
 }
\ No newline at end of file
diff --git a/mobile-app/src/trans/bh.json b/mobile-app/src/trans/bh.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/bh.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/bi.json b/mobile-app/src/trans/bi.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/bi.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/bm.json b/mobile-app/src/trans/bm.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/bm.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/bn.json b/mobile-app/src/trans/bn.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/bn.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/br.json b/mobile-app/src/trans/br.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/br.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ce.json b/mobile-app/src/trans/ce.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ce.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ceb.json b/mobile-app/src/trans/ceb.json
index 10ef06ff8e..776e635197 100644
--- a/mobile-app/src/trans/ceb.json
+++ b/mobile-app/src/trans/ceb.json
@@ -42,7 +42,7 @@
   "label_text_activity_empty_text": "Wala pa kay nadugang na lugar para sa basura. Pag naa na, malista dinhi.",
   "label_text_activity_empty_hint": "Pagdugang ug lugar para sa basura!",
   "label_header_notific": "Pagpahibalo",
-  "label_text_notific_empty_subtitle": "Walay makita diari!",
+  "label_text_notific_empty_subtitle": "Walay makita dire!",
   "label_text_notific_empty_text": "Wala pay mga pahibalo na niabot, pahibal-on ka namo kung naa na!",
   "label_header_profile": "Akong Takiliran",
   "label_header_settings": "Himutangan sa Account",
@@ -57,7 +57,7 @@
   "label_text_congrats_text": "Karon i-save ang punto pamaagi sa pagberipika sa datos.",
   "label_header_createTP": "Paghimu ug trashpoint",
   "label_button_createTP_editloc": "Ilisdi lokasyon",
-  "label_header_edit_loc": "Ilisdi ang lokasyon",
+  "label_header_edit_loc": "Ilisdi lokasyon",
   "label_button_edit_loc_set": "Itakna ang lokasyon sa trashpoint",
   "label_text_createTP_status_subtitle": "Kahimtang sa punto",
   "label_text_createTP_status_text": "Lung kinahanglan aksyunan dayun (makalason, heavy metals) palihug itakna na hulga.",
@@ -108,9 +108,9 @@
   "label_error_modal_default_subtitle": "Nakadetek ug sayop sa serber ang fail whale!",
   "label_location_permission_warning_ios": "Kinahanglan nimo ilisan pagtugot sa lokasyon. Aron mahimo ni, adto sa Settings > Privacy > Location services.",
   "label_location_permission_warning_android": "Kinahanglan nimo ilisan ang pagtugot sa lokasyon. Aron mahimo ni, adto sa Settings > Apps.",
-  "label_location_off_warning": "Nakapalong ang serbisyo para sa Lokasyon. Palihug ug abri sa sa imong GPS sa Settings aron magamit ang application.",
+  "label_location_off_warning": "Nakapalong ang Location Services. Palihug ug abri sa sa imong GPS sa Settings aron magamit ang application.",
   "label_location_modal_title": "Abrihi ang lokasyon",
-  "label_network_off_warning_title": "Walay koneksiyon sa network",
+  "label_network_off_warning_title": "Walay koneksyon sa network",
   "label_network_off_warning": "Naka disable ang mobile data. Abrihi ang mobile o ikonekta sa Wi-Fi ang imong telepono aron magamit ang application.",
   "label_loading_image_text": "Hapit na...",
   "label_loading_image_subtext": "Palihug huwat samtang kina-save namu imong mga kalihokan.",
diff --git a/mobile-app/src/trans/ch.json b/mobile-app/src/trans/ch.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ch.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/chr.json b/mobile-app/src/trans/chr.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/chr.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/co.json b/mobile-app/src/trans/co.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/co.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/cr.json b/mobile-app/src/trans/cr.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/cr.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/crs.json b/mobile-app/src/trans/crs.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/crs.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/cs.json b/mobile-app/src/trans/cs.json
index 78344189bc..a5e09eb2ff 100644
--- a/mobile-app/src/trans/cs.json
+++ b/mobile-app/src/trans/cs.json
@@ -1,11 +1,11 @@
 {
-  "label_text_app_subtitle": "Let's clean up the world together!",
-  "label_button_facebook": "Continue with Facebook",
-  "label_button_google": "Continue with Google",
-  "label_button_try_app": "Try out the app without account",
-  "label_button_acknowledge": "Ok, got it!",
-  "label_button_cancel": "Cancel",
-  "label_button_continue": "Continue",
+  "label_text_app_subtitle": "Pojďme společně vyčistit svět!",
+  "label_button_facebook": "Pokračovat přes Facebook",
+  "label_button_google": "Pokračovat přes Google",
+  "label_button_try_app": "Vyzkoušet aplikaci bez účtu",
+  "label_button_acknowledge": "Ok, mám to!",
+  "label_button_cancel": "Zrušit",
+  "label_button_continue": "Pokračovat",
   "label_trash_status_threat": "threat",
   "label_trash_status_regular": "regular",
   "label_trash_status_cleaned": "cleaned",
@@ -44,14 +44,14 @@
   "label_header_notific": "Notifications",
   "label_text_notific_empty_subtitle": "Nothing to see here!",
   "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
-  "label_header_profile": "My profile",
-  "label_header_settings": "Account settings",
-  "label_button_country_empty": "Country",
-  "label_text_country": "Country",
-  "label_header_select_country": "Select a country",
-  "label_text_select_country_hint": "Search",
+  "label_header_profile": "Můj profil",
+  "label_header_settings": "Nastavení účtu",
+  "label_button_country_empty": "Země",
+  "label_text_country": "Země",
+  "label_header_select_country": "Vyberte zemi",
+  "label_text_select_country_hint": "Vyhledávání",
   "label_button_tc": "Terms and Conditions",
-  "label_button_logout": "Log out",
+  "label_button_logout": "Odhlásit se",
   "label_text_congrats_image": "Trash captured",
   "label_text_congrats_subtitle": "Great job!",
   "label_text_congrats_text": "Now save the point by verifying the data.",
@@ -72,14 +72,14 @@
   "label_text_detailsTP_amount": "Trash amount",
   "label_text_detailsTP_type": "Trash type",
   "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
-  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_text_editTP_letsconfirm": "Ano, potvrzuji",
   "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
   "label_text_editTP_letsedit": "No, let's edit",
   "label_header_editTP": "Edit a trashpoint",
   "label_button_editTP_save": "Save trashpoint changes",
   "label_alert_editTP_edit": "Trashpoint successfully updated",
   "label_alert_editTP_delete": "Trashpoint successfully deleted",
-  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_subtitle": "Mimo dosah",
   "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
   "label_error_saveTP_subtitle": "Save trashpoint",
   "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
diff --git a/mobile-app/src/trans/cv.json b/mobile-app/src/trans/cv.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/cv.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/da.json b/mobile-app/src/trans/da.json
index 408d2d0057..e44e221fc6 100644
--- a/mobile-app/src/trans/da.json
+++ b/mobile-app/src/trans/da.json
@@ -50,7 +50,7 @@
   "label_text_country": "Land",
   "label_header_select_country": "Vælg et land",
   "label_text_select_country_hint": "Search",
-  "label_button_tc": "Terms and Conditions",
+  "label_button_tc": "Betingelser og vilkår",
   "label_button_logout": "Log out",
   "label_text_congrats_image": "Trash captured",
   "label_text_congrats_subtitle": "Great job!",
@@ -108,15 +108,15 @@
   "label_error_modal_default_subtitle": "Vi fandt en fejl på serveren!",
   "label_location_permission_warning_ios": "Du skal ændre tilladelser for sted. For at gøre dette, gå til Indstillinger > Privatliv > Serviceydelser for sted.",
   "label_location_permission_warning_android": "Du skal ændre tilladelser for sted. For at gøre dette, gå til Indstillinger > Apps.",
-  "label_location_off_warning": "Serviceydelser for sted er slået fra. Venligst aktiver din GPS i dine Indstillinger for at bruge fuktionen.",
-  "label_location_modal_title": "Aktiver sted",
-  "label_network_off_warning_title": "Ingen netværksforbindelse",
-  "label_network_off_warning": "Mobildata er deaktiveret. Aktiverer mobil data eller tilslut din telefon til Wi-Fi for at bruge funktionen.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
   "label_loading_image_text": "Næsten færdig...",
   "label_loading_image_subtext": "Vent venligst, mens vi gemmer dine handlinger.",
   "label_create_marker_missing_photos": "Markørbillederne kunne ikke overføres. Prøv at tilføje dem igen.",
   "label_edit_marker_missing_photos": "Markørbillederne kunne ikke overføres. Prøv at tilføje dem igen.",
-  "label_confirm_marker_missing_photos": "Markørbillederne kunne ikke uploades. Prøv venligst at tilføje dem igen.",
+  "label_confirm_marker_missing_photos": "Markørbillederne kunne ikke overføres. Prøv at tilføje dem igen.",
   "label_button_delete": "Slet",
   "label_delete_photo_title": "Slet foto",
   "label_delete_photo_subtitle": "Er du sikker på, du vil slette fotoet? Du kan ikke fortryde dette.",
diff --git a/mobile-app/src/trans/de.json b/mobile-app/src/trans/de.json
index 53d755a0cf..3316f2dbb8 100644
--- a/mobile-app/src/trans/de.json
+++ b/mobile-app/src/trans/de.json
@@ -50,7 +50,7 @@
   "label_text_country": "Land",
   "label_header_select_country": "Wähle ein Land",
   "label_text_select_country_hint": "Suchen",
-  "label_button_tc": "Allgemeine Geschäftsbedigungen",
+  "label_button_tc": "Allgemeine Geschäftsbedingungen",
   "label_button_logout": "Abmelden",
   "label_text_congrats_image": "Müll erbeutet",
   "label_text_congrats_subtitle": "Gute Arbeit!",
diff --git a/mobile-app/src/trans/dv.json b/mobile-app/src/trans/dv.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/dv.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/dz.json b/mobile-app/src/trans/dz.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/dz.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/el.json b/mobile-app/src/trans/el.json
index 0a659718be..e85e574f25 100644
--- a/mobile-app/src/trans/el.json
+++ b/mobile-app/src/trans/el.json
@@ -50,7 +50,7 @@
   "label_text_country": "Χώρα",
   "label_header_select_country": "Επιλέξτε χώρα",
   "label_text_select_country_hint": "Αναζήτηση",
-  "label_button_tc": "Όροι και προυποθέσεις",
+  "label_button_tc": "Όροι και προϋποθέσεις",
   "label_button_logout": "Αποσύνδεση",
   "label_text_congrats_image": "Τα απορρίμματα αποτυπώθηκαν",
   "label_text_congrats_subtitle": "Φανταστικά!",
diff --git a/mobile-app/src/trans/en.json b/mobile-app/src/trans/en.json
index e94a8c0088..bec693b6bc 100644
--- a/mobile-app/src/trans/en.json
+++ b/mobile-app/src/trans/en.json
@@ -126,5 +126,7 @@
   "label_text_about_4": "Estonian product, sponsored by the country and government",
   "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
   "label_button_editTP_delete": "Delete trashpoint",
-  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
-}
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator.",
+  "label_no_connection_note": "Without the Internet, you can only mark the trash. This mark will be transferred to the server when the connection to the Internet is restored.",
+  "label_your_coordinates": "Your coordinates"
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/eo.json b/mobile-app/src/trans/eo.json
new file mode 100644
index 0000000000..49ad7ca87b
--- /dev/null
+++ b/mobile-app/src/trans/eo.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Ni purigu la mondon kune!",
+  "label_button_facebook": "Daŭrigu per Facebook",
+  "label_button_google": "Daŭrigu per Google",
+  "label_button_try_app": "Elprovu la apon sen konto",
+  "label_button_acknowledge": "Okej, mi komprenis!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Daŭrigu",
+  "label_trash_status_threat": "danĝero",
+  "label_trash_status_regular": "normala",
+  "label_trash_status_cleaned": "purigita",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "uzanto",
+  "label_trash_status_change_location": "ŝanĝu lokon",
+  "label_trash_status_state_threat": "Tiu-ĉi punkto estas danĝero!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "Tiu-ĉi punkto estas purigita!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Kreita",
+  "label_TP_updated_date": "Ĝisdatigita",
+  "label_TP_by": " de ",
+  "label_trash_amount_handful": "mano da",
+  "label_trash_amount_bagful": "sako da",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastiko",
+  "label_trash_type_metal": "Metalo",
+  "label_trash_type_glass": "Vitro",
+  "label_trash_type_electro": "Eletronikaĵoj",
+  "label_trash_type_paper": "Papero/ligno",
+  "label_trash_type_tyres": "Pneŭno",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Mebloj",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Mapo",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "Miaj aktivecoj",
+  "label_text_activity_empty_subtitle": "Nenio por vidi ĉi-tie!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Aldonu rubaĵpunkton!",
+  "label_header_notific": "Sciigoj",
+  "label_text_notific_empty_subtitle": "Nenio por vidi ĉi-tie!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "Mia profilo",
+  "label_header_settings": "Kontaj agordoj",
+  "label_button_country_empty": "Lando",
+  "label_text_country": "Lando",
+  "label_header_select_country": "Elektu landon",
+  "label_text_select_country_hint": "Serĉi",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Elsaluti",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Bonege!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Krei rubaĵpunkton",
+  "label_button_createTP_editloc": "Redakti lokon",
+  "label_header_edit_loc": "Redakti lokon",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Stato de punkto",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Aldonu fotojn de la rubaĵo",
+  "label_text_createTP_select_amount": "Elekto kvanton de la rubaĵo",
+  "label_text_createTP_select_type": "Elektu la tipon de la rubaĵo",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Kreu rubaĵpunkton",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Fotoj de la rubaĵo",
+  "label_text_detailsTP_amount": "Kvanto de la rubaĵo",
+  "label_text_detailsTP_type": "Tipo de rubaĵo",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Jes, mi konfirmas",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "Ne, ni redaktu",
+  "label_header_editTP": "Redakti rubaĵpunkton",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Ŝanĝu rubaĵpunkton",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Detaloj pri la rubaĵpunkto",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "Pri",
+  "label_edit_trashpoint_button": "Redakti rubaĵpunkton",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Reprovi",
+  "label_country_picker_placeholder": "Elektu vian landon",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Ho ve!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Preskaŭ alvenata...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Forigi",
+  "label_delete_photo_title": "Forigi foton",
+  "label_delete_photo_subtitle": "Ĉu vi certas ke vi volas forigi la foton? Ve ne povas malfari tion.",
+  "label_text_about_1": "Tiu-ĉi apo estas iniciativo de Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Forigi rubaĵpunkton",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/et.json b/mobile-app/src/trans/et.json
index 0006d94bdc..11aabb4663 100644
--- a/mobile-app/src/trans/et.json
+++ b/mobile-app/src/trans/et.json
@@ -6,16 +6,16 @@
   "label_button_acknowledge": "Selge, sain aru!",
   "label_button_cancel": "Loobu",
   "label_button_continue": "Jätka",
-  "label_trash_status_threat": "oht",
+  "label_trash_status_threat": "ohtlik",
   "label_trash_status_regular": "tavaline",
   "label_trash_status_cleaned": "koristatud",
   "label_trash_status_outdated": "aegunud",
   "label_trash_status_user": "kasutaja",
   "label_trash_status_change_location": "muuda asukohta",
-  "label_trash_status_state_threat": "Ohtlik leiukoht!",
+  "label_trash_status_state_threat": "Ohtlik prügipunkt!",
   "label_trash_status_state_regular": "Sage prügi leiukoht.",
-  "label_trash_status_state_cleaned": "Koristatud leiukoht!",
-  "label_trash_status_state_outdated": "Ajakohastamata leiukoht!",
+  "label_trash_status_state_cleaned": "Koristatud prügipunkt!",
+  "label_trash_status_state_outdated": "Aegunud prügipunkt!",
   "label_TP_created_date": "Loodud",
   "label_TP_updated_date": "Uuendatud",
   "label_TP_by": " ",
@@ -37,12 +37,12 @@
   "label_header_map": "Kaart",
   "label_text_popover_subtitle": "Liitu prügi kaardistajatega!",
   "label_text_popover_text": "Alusta prügi leiukohtade kaardistamist, et muuta oma ümbrus puhtamaks.",
-  "label_header_activity": "Minu tegevused",
-  "label_text_activity_empty_subtitle": "Siin pole midagi vaadata!",
+  "label_header_activity": "Minu panus",
+  "label_text_activity_empty_subtitle": "Pole veel midagi näidata!",
   "label_text_activity_empty_text": "Sa ei ole veel lisanud ühtegi prügi leiukohta. Kui lisad uue leiukoha, siis ilmub see siia.",
   "label_text_activity_empty_hint": "Lisa prügi leiukoht!",
   "label_header_notific": "Teated",
-  "label_text_notific_empty_subtitle": "Siin pole midagi vaadata!",
+  "label_text_notific_empty_subtitle": "Pole veel midagi näidata!",
   "label_text_notific_empty_text": "Uusi teateid pole, ent kui need saabuvad, siis kuvame neid siin!",
   "label_header_profile": "Minu profiil",
   "label_header_settings": "Konto sätted",
@@ -68,7 +68,7 @@
   "label_text_createTP_add_hashtags_hint": "näiteks: #tootenimi, #purgid",
   "label_button_createTP_confirm_create": "Loo uus prügi leiukoht",
   "label_alert_createTP_success": "Prügi leiukoht edukalt loodud",
-  "label_text_detailsTP_photos": "Prügi fotod",
+  "label_text_detailsTP_photos": "Fotod prügist",
   "label_text_detailsTP_amount": "Prügi kogus",
   "label_text_detailsTP_type": "Prügi tüüp",
   "label_text_editTP_ask": "Kas prügi leiukoha info on täpne ja ajakohastatud?",
@@ -77,11 +77,11 @@
   "label_text_editTP_letsedit": "Ei, muudame infot",
   "label_header_editTP": "Muuda prügi leiukohta",
   "label_button_editTP_save": "Salvesta muudatused",
-  "label_alert_editTP_edit": "Prügi leiukoht edukalt ajakohastatud",
+  "label_alert_editTP_edit": "Prügipunkt edukalt uuendatud",
   "label_alert_editTP_delete": "Prügi leiukoht edukalt kustutatud",
   "label_error_editTP_out_of_rng_subtitle": "Vahemikust väljas",
   "label_error_editTP_out_of_rng_text": "Leiukohta saate muuta ainult siis, kui olete 100 meetri raadiuses.",
-  "label_error_saveTP_subtitle": "Salvesta prügi leiukoht",
+  "label_error_saveTP_subtitle": "Salvesta prügipunkt",
   "label_error_saveTP_pic_and_type": "Palun lisa pilt prügi leiukohast ning määra prügi tüüp.",
   "label_error_saveTP_picture": "Meile on abiks, kui teed enne salvestamist prügi leiukohast vähemalt ühe pildi.",
   "label_error_saveTP_trash_type": "Meile on kasulikum kui määrad enne salvestamist prügi punkti tüübi.",
@@ -118,7 +118,7 @@
   "label_edit_marker_missing_photos": "Märgistusfotosid ei olnud võimalik üles laadida. Palun proovi need uuesti lisada.",
   "label_confirm_marker_missing_photos": "Märgistusfotosid ei olnud võimalik üles laadida. Palun proovi need uuesti lisada.",
   "label_button_delete": "Kustuta",
-  "label_delete_photo_title": "Kustuta pilt",
+  "label_delete_photo_title": "Kustuta foto",
   "label_delete_photo_subtitle": "Kas oled kindel, et soovid pildi kustutada? Seda tegevust ei saa tagasi võtta.",
   "label_text_about_1": "See rakendus on sihtasutuse \"Teeme Ära!\" Maailmakoristus algatus",
   "label_text_about_2": "Kõik ülemaailmsete kasutajate poolt kogutud andmed on nähtavad globaalsel prügikaardil, et Maailmakoristuspäeval, 15. septembril 2018, saaks talguid korraldada",
diff --git a/mobile-app/src/trans/ff.json b/mobile-app/src/trans/ff.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ff.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/fil.json b/mobile-app/src/trans/fil.json
index bfef181476..ae23cdd99d 100644
--- a/mobile-app/src/trans/fil.json
+++ b/mobile-app/src/trans/fil.json
@@ -115,8 +115,8 @@
   "label_loading_image_text": "Halos tapos na...",
   "label_loading_image_subtext": "Mangyaring maghintay habang isina-save natin ang iyong mga aksyon.",
   "label_create_marker_missing_photos": "Hindi nai-upload ang mga marker na larawan. Pakisubukang idagdag muli ang mga ito.",
-  "label_edit_marker_missing_photos": "Hindi mai-upload ang mga marker na larawan. Pakisubukang idagdag muli ang mga ito.",
-  "label_confirm_marker_missing_photos": "Hindi mai-upload ang mga marker na larawan. Pakisubukang idagdag muli ang mga ito.",
+  "label_edit_marker_missing_photos": "Hindi nai-upload ang mga marker na larawan. Pakisubukang idagdag muli ang mga ito.",
+  "label_confirm_marker_missing_photos": "Hindi nai-upload ang mga marker na larawan. Pakisubukang idagdag muli ang mga ito.",
   "label_button_delete": "Burahin",
   "label_delete_photo_title": "Burahin ang larawan",
   "label_delete_photo_subtitle": "Tiyak ka bang gusto mong burahin ang larawan? Hindi mo na maibabalik ito.",
diff --git a/mobile-app/src/trans/fo.json b/mobile-app/src/trans/fo.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/fo.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/fr.json b/mobile-app/src/trans/fr.json
index d33026ac10..33da6e2c63 100644
--- a/mobile-app/src/trans/fr.json
+++ b/mobile-app/src/trans/fr.json
@@ -87,7 +87,7 @@
   "label_error_saveTP_trash_type": "Il est recommandé d'indiquer le type de déchets avant de sauvegarder.",
   "label_error_change_loc_subtitle": "Trop loin",
   "label_error_change_loc_text": "Veuillez ne cartographier que les spots situés à moins de 100 mètres de votre position.",
-  "label_error_generic_error_subtitle": "Intitulé trop long",
+  "label_error_generic_error_subtitle": "Trop loin",
   "label_error_generic_error_text": "Une erreur est survenue sur le serveur.",
   "label_error_network_subtitle": "Pas de connexion réseau",
   "label_error_network_text": "Les données mobiles sont désactivées. Activez les données mobiles ou connectez votre téléphone à un réseau Wi-Fi pour utiliser l'application.",
@@ -108,10 +108,10 @@
   "label_error_modal_default_subtitle": "La baleine échouée à détecté une erreur de serveur ! ",
   "label_location_permission_warning_ios": "Vous devez changer les autorisations de géolocalisation. Pour ce faire, allez dans Paramètres > Confidentialité > Services de localisation.",
   "label_location_permission_warning_android": "Vous devez changer les autorisations de géolocalisation. Pour ce faire, allez dans Paramètres > Applications.",
-  "label_location_off_warning": "Les Services de Géolocalisation sont désactivés. Veuillez activer votre GPS dans vos Paramètres pour pouvoir utiliser l'application.",
+  "label_location_off_warning": "Les Services de Géolocalisation sont désactivés. Activez le GPS dans les Paramètres pour pouvoir utiliser l'application.",
   "label_location_modal_title": "Activer la géolocalisation",
-  "label_network_off_warning_title": "Aucune connexion réseau",
-  "label_network_off_warning": "Les données mobiles sont désactivées. Activez les données mobiles ou connectez votre téléphone à un réseau Wi-Fi pour pouvoir utiliser l'application.",
+  "label_network_off_warning_title": "Pas de connexion réseau",
+  "label_network_off_warning": "Les données mobiles sont désactivées. Activez les données mobiles ou connectez votre téléphone à un réseau Wi-Fi pour utiliser l'application.",
   "label_loading_image_text": "On y est presque...",
   "label_loading_image_subtext": "Veuillez patienter pendant que nous enregistrons vos actions.",
   "label_create_marker_missing_photos": "Les photos de repérage n'ont pas pu être téléchargées. Veuillez essayer de les envoyer à nouveau.",
diff --git a/mobile-app/src/trans/fra.json b/mobile-app/src/trans/fra.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/fra.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/frp.json b/mobile-app/src/trans/frp.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/frp.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/fur.json b/mobile-app/src/trans/fur.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/fur.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/fy.json b/mobile-app/src/trans/fy.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/fy.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/gaa.json b/mobile-app/src/trans/gaa.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/gaa.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/gn.json b/mobile-app/src/trans/gn.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/gn.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/gu.json b/mobile-app/src/trans/gu.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/gu.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/gv.json b/mobile-app/src/trans/gv.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/gv.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/hi.json b/mobile-app/src/trans/hi.json
index 352b7c9134..1599fb97f2 100644
--- a/mobile-app/src/trans/hi.json
+++ b/mobile-app/src/trans/hi.json
@@ -42,7 +42,7 @@
   "label_text_activity_empty_text": "आपने अभी तक कोई भी कचरे का स्थल नहीं जोड़ा है| जब आप करेंगे, तो वे यहां सूचीबद्ध होंगे|",
   "label_text_activity_empty_hint": "एक कचरे का स्थल जोड़ें!",
   "label_header_notific": "सूचनाएं",
-  "label_text_notific_empty_subtitle": "यहां पर देखने के लिए कुछ नहीं!",
+  "label_text_notific_empty_subtitle": "देखने के लिए कुछ नहीं है यहां!",
   "label_text_notific_empty_text": "हमने अभी तक कोई सूचनाएं नहीं देखी हैं, लेकिन हम आपको बताएंगे जब ऐसा होता है!",
   "label_header_profile": "मेरी पार्श्वचित्र",
   "label_header_settings": "खाते के सेटिंग्स",
diff --git a/mobile-app/src/trans/hil.json b/mobile-app/src/trans/hil.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/hil.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ho.json b/mobile-app/src/trans/ho.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ho.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/hu.json b/mobile-app/src/trans/hu.json
index 78344189bc..75893d0738 100644
--- a/mobile-app/src/trans/hu.json
+++ b/mobile-app/src/trans/hu.json
@@ -1,130 +1,130 @@
 {
-  "label_text_app_subtitle": "Let's clean up the world together!",
-  "label_button_facebook": "Continue with Facebook",
-  "label_button_google": "Continue with Google",
-  "label_button_try_app": "Try out the app without account",
-  "label_button_acknowledge": "Ok, got it!",
-  "label_button_cancel": "Cancel",
-  "label_button_continue": "Continue",
-  "label_trash_status_threat": "threat",
-  "label_trash_status_regular": "regular",
-  "label_trash_status_cleaned": "cleaned",
-  "label_trash_status_outdated": "outdated",
-  "label_trash_status_user": "user",
+  "label_text_app_subtitle": "Tisztítsuk meg együtt a világot!",
+  "label_button_facebook": "Továbbra is a Facebook",
+  "label_button_google": "Továbbra is a Google",
+  "label_button_try_app": "Próbálja ki az alkalmazást, anélkül, hogy figyelembe",
+  "label_button_acknowledge": "Ok, megvan!",
+  "label_button_cancel": "Mégse",
+  "label_button_continue": "Tovább",
+  "label_trash_status_threat": "fenyegetés",
+  "label_trash_status_regular": "rendszeres",
+  "label_trash_status_cleaned": "tisztítani",
+  "label_trash_status_outdated": "elavult",
+  "label_trash_status_user": "felhasználó",
   "label_trash_status_change_location": "changeLocation",
-  "label_trash_status_state_threat": "This point is a threat!",
-  "label_trash_status_state_regular": "This is a regular trashpoint.",
-  "label_trash_status_state_cleaned": "This point is cleaned!",
-  "label_trash_status_state_outdated": "This point is outdated!",
-  "label_TP_created_date": "Created",
+  "label_trash_status_state_threat": "Ez a pont egy fenyegetés!",
+  "label_trash_status_state_regular": "Ez egy rendszeres trashpoint.",
+  "label_trash_status_state_cleaned": "Ez a pont tisztítani!",
+  "label_trash_status_state_outdated": "Ezen a ponton elavult!",
+  "label_TP_created_date": "Létrehozott",
   "label_TP_updated_date": "Updated",
-  "label_TP_by": " by ",
-  "label_trash_amount_handful": "handful",
-  "label_trash_amount_bagful": "bagful",
+  "label_TP_by": " által ",
+  "label_trash_amount_handful": "maroknyi",
+  "label_trash_amount_bagful": "zsákkal",
   "label_trash_amount_cartloadl": "cartload",
-  "label_trash_amount_truckload": "truckload",
-  "label_trash_type_plastic": "Plastic",
-  "label_trash_type_metal": "Metal",
-  "label_trash_type_glass": "Glass",
-  "label_trash_type_electro": "Electronics",
-  "label_trash_type_paper": "Paper/Wood",
-  "label_trash_type_tyres": "Tyres",
-  "label_trash_type_dom_waste": "Domestic waste",
-  "label_trash_type_furniture": "Furniture",
-  "label_trash_type_org_waste": "Organic waste",
-  "label_header_tc": "Terms and Conditions",
-  "label_button_tc_agree": "I agree with the Terms & Conditions",
-  "label_header_map": "Map",
-  "label_text_popover_subtitle": "Join other people who are mapping trash!",
-  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
-  "label_header_activity": "My activity",
-  "label_text_activity_empty_subtitle": "Nothing to see here!",
-  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
-  "label_text_activity_empty_hint": "Add a trashpoint!",
-  "label_header_notific": "Notifications",
-  "label_text_notific_empty_subtitle": "Nothing to see here!",
-  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
-  "label_header_profile": "My profile",
-  "label_header_settings": "Account settings",
-  "label_button_country_empty": "Country",
-  "label_text_country": "Country",
-  "label_header_select_country": "Select a country",
-  "label_text_select_country_hint": "Search",
-  "label_button_tc": "Terms and Conditions",
-  "label_button_logout": "Log out",
-  "label_text_congrats_image": "Trash captured",
-  "label_text_congrats_subtitle": "Great job!",
-  "label_text_congrats_text": "Now save the point by verifying the data.",
-  "label_header_createTP": "Create a trashpoint",
-  "label_button_createTP_editloc": "Edit location",
-  "label_header_edit_loc": "Edit location",
-  "label_button_edit_loc_set": "Set trashpoint location",
-  "label_text_createTP_status_subtitle": "Point status",
-  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
-  "label_text_createTP_add_photos": "Add trash photos",
-  "label_text_createTP_select_amount": "Select trash amount",
-  "label_text_createTP_select_type": "Select trash type",
-  "label_text_createTP_add_hashtags": "Additional added tags",
-  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
-  "label_button_createTP_confirm_create": "Create trashpoint",
-  "label_alert_createTP_success": "Trashpoint successfully created",
-  "label_text_detailsTP_photos": "Trash photos",
-  "label_text_detailsTP_amount": "Trash amount",
-  "label_text_detailsTP_type": "Trash type",
-  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
-  "label_text_editTP_letsconfirm": "Yes, I confirm",
-  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
-  "label_text_editTP_letsedit": "No, let's edit",
-  "label_header_editTP": "Edit a trashpoint",
-  "label_button_editTP_save": "Save trashpoint changes",
-  "label_alert_editTP_edit": "Trashpoint successfully updated",
-  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_trash_amount_truckload": "teherautónyi",
+  "label_trash_type_plastic": "Műanyag",
+  "label_trash_type_metal": "Fém",
+  "label_trash_type_glass": "Üveg",
+  "label_trash_type_electro": "Elektronika",
+  "label_trash_type_paper": "Papír/Fa",
+  "label_trash_type_tyres": "Gumiabroncsok",
+  "label_trash_type_dom_waste": "Háztartási hulladék",
+  "label_trash_type_furniture": "Bútor",
+  "label_trash_type_org_waste": "Szerves hulladék",
+  "label_header_tc": "Általános szerződési Feltételek",
+  "label_button_tc_agree": "Egyetértek a felhasználási Feltételek",
+  "label_header_map": "Térkép",
+  "label_text_popover_subtitle": "Csatlakozz a többi ember, aki feltérképezése szemetet!",
+  "label_text_popover_text": "Kezdeni trashpoints, hogy a közösségi tisztább, egészségesebb.",
+  "label_header_activity": "A tevékenység",
+  "label_text_activity_empty_subtitle": "Nincs itt semmi látnivaló!",
+  "label_text_activity_empty_text": "Még nem adott hozzá semmilyen trashpoints még. Ha lesznek itt felsorolt.",
+  "label_text_activity_empty_hint": "Adjunk hozzá egy trashpoint!",
+  "label_header_notific": "Értesítések",
+  "label_text_notific_empty_subtitle": "Nincs itt semmi látnivaló!",
+  "label_text_notific_empty_text": "Még nem láttam olyan értesítések jött még be, de majd szólok, ha akarjuk!",
+  "label_header_profile": "A profil",
+  "label_header_settings": "Fiók beállítások",
+  "label_button_country_empty": "Ország",
+  "label_text_country": "Ország",
+  "label_header_select_country": "Válassza ki az országot",
+  "label_text_select_country_hint": "Keresés",
+  "label_button_tc": "Általános szerződési Feltételek",
+  "label_button_logout": "Kijelentkezés",
+  "label_text_congrats_image": "Szemetet rögzített",
+  "label_text_congrats_subtitle": "Szép munka!",
+  "label_text_congrats_text": "Most menteni a lényeg, hogy ellenőrzi az adatokat.",
+  "label_header_createTP": "Hozzon létre egy trashpoint",
+  "label_button_createTP_editloc": "A hely szerkesztése",
+  "label_header_edit_loc": "A hely szerkesztése",
+  "label_button_edit_loc_set": "Állítsa trashpoint helye",
+  "label_text_createTP_status_subtitle": "Pont állapota",
+  "label_text_createTP_status_text": "Ha egy gyors cselekvésre van szükség (toxikus nehézfémek), kérjük, állítsa be, mint a fenyegetés.",
+  "label_text_createTP_add_photos": "Add szemetet fotók",
+  "label_text_createTP_select_amount": "Válassza ki a szemetet összeg",
+  "label_text_createTP_select_type": "Válassza ki a szemetet típus",
+  "label_text_createTP_add_hashtags": "További hozzáadott kategória",
+  "label_text_createTP_add_hashtags_hint": "ie. #márkanév, #doboz",
+  "label_button_createTP_confirm_create": "Hozzon létre trashpoint",
+  "label_alert_createTP_success": "Sikeresen létrehozta Trashpoint",
+  "label_text_detailsTP_photos": "Szemetet fotók",
+  "label_text_detailsTP_amount": "Szemetet összeg",
+  "label_text_detailsTP_type": "Szemetet típus",
+  "label_text_editTP_ask": "Ez trashpoint információk továbbra is korrekt, naprakész?",
+  "label_text_editTP_letsconfirm": "Igen, megerősítem,",
+  "label_alert_editTP_confirm": "Trashpoint sikeresen megerősítette,",
+  "label_text_editTP_letsedit": "Nem, edit",
+  "label_header_editTP": "Edit egy trashpoint",
+  "label_button_editTP_save": "A mentés trashpoint változások",
+  "label_alert_editTP_edit": "Trashpoint sikeresen frissítve",
+  "label_alert_editTP_delete": "Trashpoint sikeresen törölve",
   "label_error_editTP_out_of_rng_subtitle": "Out of range",
-  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
-  "label_error_saveTP_subtitle": "Save trashpoint",
-  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
-  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
-  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
-  "label_error_change_loc_subtitle": "Out of bounds",
-  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
-  "label_error_generic_error_subtitle": "Out of bounds",
-  "label_error_generic_error_text": "There was an error on the server.",
-  "label_error_network_subtitle": "No network connection",
-  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_error_location_subtitle": "Enable location",
-  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
-  "label_trash_details_header": "Trashpoint details",
-  "label_privacy_policy_header": "Privacy Policy",
-  "label_about_header": "About",
-  "label_edit_trashpoint_button": "Edit trashpoint",
-  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
-  "label_retry_button": "Retry",
-  "label_country_picker_placeholder": "Choose your country",
-  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
-  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
-  "label_camera_error_title": "Camera Access Denied",
+  "label_error_editTP_out_of_rng_text": "Egy ponton lehet csak edx'ited ha 100 méteren belül.",
+  "label_error_saveTP_subtitle": "A mentés trashpoint",
+  "label_error_saveTP_pic_and_type": "Ez több, hasznos nekünk, ha legalább egy képet a trashpoint, majd állítsa be a szemét típus.",
+  "label_error_saveTP_picture": "Ez több, hasznos nekünk, ha legalább egy képet a trashpoint mentése előtt.",
+  "label_error_saveTP_trash_type": "Ez több, hasznos számunkra, ha a trashpoint típus mentése előtt.",
+  "label_error_change_loc_subtitle": "Tilos",
+  "label_error_change_loc_text": "Kérjük, tegyen egy pont 100 méteren belül van a helye.",
+  "label_error_generic_error_subtitle": "Tilos",
+  "label_error_generic_error_text": "Hiba történt a kiszolgálón.",
+  "label_error_network_subtitle": "Nincs hálózati kapcsolat",
+  "label_error_network_text": "Mobil adat le van tiltva. Engedélyezze a mobil adat-vagy csatlakoztassa telefonját Wi-Fi-t, hogy használja az alkalmazást.",
+  "label_error_location_subtitle": "Engedélyezze a helymeghatározást",
+  "label_error_location_text": "Elhelyezkedés a Szolgáltatások ki vannak kapcsolva. Kérjük, engedélyezze a GPS a Beállításokat használja az alkalmazás.",
+  "label_error_loc_permission_text": "A helymeghatározás nem engedélyezett. Kérem, engedje meg nekik, annak érdekében, hogy használja az alkalmazást.",
+  "label_trash_details_header": "Trashpoint részletek",
+  "label_privacy_policy_header": "Adatvédelmi Politika",
+  "label_about_header": "Körülbelül",
+  "label_edit_trashpoint_button": "Szerkesztés trashpoint",
+  "label_100m_limit_modal": "A pont csak akkor szerkeszthető, ha 100 méteren belül.",
+  "label_retry_button": "Próbálja újra",
+  "label_country_picker_placeholder": "Válassza ki az országot",
+  "label_camera_permission_warning_ios": "Módosítania kell a fényképezőgép hozzáférési engedélyekkel. Ehhez lépjen a Beállítások > Adatvédelem > Kamera",
+  "label_camera_permission_warning_android": "Módosítania kell a fényképezőgép hozzáférési engedélyekkel. Ehhez lépjen a Beállítások > Alkalmazások",
+  "label_camera_error_title": "Kamera Hozzáférés Megtagadva",
   "label_error_modal_default_title": "Oh noes!",
-  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
-  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
-  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
-  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_location_modal_title": "Enable location",
-  "label_network_off_warning_title": "No network connection",
-  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_loading_image_text": "Almost there...",
-  "label_loading_image_subtext": "Please wait while we save your actions.",
-  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_button_delete": "Delete",
-  "label_delete_photo_title": "Delete photo",
-  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
-  "label_text_about_1": "This app is an initiative by Let's Do It World",
-  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
-  "label_text_about_3": "This app is a joint cooperation with",
-  "label_text_about_4": "Estonian product, sponsored by the country and government",
-  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
-  "label_button_editTP_delete": "Delete trashpoint",
-  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+  "label_error_modal_default_subtitle": "A sikertelen bálna észlelt szerver hiba!",
+  "label_location_permission_warning_ios": "Meg kell változtatni helyen engedélyeket. Ehhez lépjen a Beállítások > Adatvédelem > helymeghatározás.",
+  "label_location_permission_warning_android": "Meg kell változtatni helyen engedélyeket. Ehhez lépjen a Beállítások > Adatvédelem > helymeghatározás.",
+  "label_location_off_warning": "Elhelyezkedés a Szolgáltatások ki vannak kapcsolva. Kérjük, engedélyezze a GPS a Beállításokat használja az alkalmazás.",
+  "label_location_modal_title": "Engedélyezze a helymeghatározást",
+  "label_network_off_warning_title": "Nincs hálózati kapcsolat",
+  "label_network_off_warning": "Mobil adat le van tiltva. Engedélyezze a mobil adat-vagy csatlakoztassa telefonját Wi-Fi-t, hogy használja az alkalmazást.",
+  "label_loading_image_text": "Majdnem ott van...",
+  "label_loading_image_subtext": "Kérjük, várjon, míg mentsük meg a tevékenységét.",
+  "label_create_marker_missing_photos": "A jelölő képeket nem lehet feltölteni. Kérjük, próbálja ki őket újra.",
+  "label_edit_marker_missing_photos": "A jelölő képeket nem lehet feltölteni. Kérjük, próbálja ki őket újra.",
+  "label_confirm_marker_missing_photos": "A jelölő képeket nem lehet feltölteni. Kérjük, próbálja ki őket újra.",
+  "label_button_delete": "Törlés",
+  "label_delete_photo_title": "Fotó törlése",
+  "label_delete_photo_subtitle": "Biztos, hogy törölni akarja a képet? Nem vonható vissza.",
+  "label_text_about_1": "Ez az alkalmazás egy olyan kezdeményezés által csináljuk Világ",
+  "label_text_about_2": "A gyűjtött adatokat a felhasználók által világszerte lesz elé képzeltem a globális szemetet térkép kezdeményező világszerte tiszta-események a Világ Takarítás Nap, szeptember 15-2018",
+  "label_text_about_3": "Ez az alkalmazás egy közös együttműködés",
+  "label_text_about_4": "Észt termék által támogatott, az ország kormány",
+  "label_text_about_5": "Támogató: észt Környezetvédelmi Minisztérium, A külügyminisztérium, az Észt Köztársaság, az észt Köztársaság, 100 program",
+  "label_button_editTP_delete": "Törlés trashpoint",
+  "label_locked_account_warning": "A fiók le van zárva. Részletekért lépjen kapcsolatba egy adminisztrátorral."
 }
\ No newline at end of file
diff --git a/mobile-app/src/trans/hz.json b/mobile-app/src/trans/hz.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/hz.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ii.json b/mobile-app/src/trans/ii.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ii.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ilo.json b/mobile-app/src/trans/ilo.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ilo.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/it.json b/mobile-app/src/trans/it.json
index b00bb0de89..3eafbeef8e 100644
--- a/mobile-app/src/trans/it.json
+++ b/mobile-app/src/trans/it.json
@@ -13,7 +13,7 @@
   "label_trash_status_user": "utente",
   "label_trash_status_change_location": "cambia posizione",
   "label_trash_status_state_threat": "Questo punto è una minaccia!",
-  "label_trash_status_state_regular": "Questo è un regolare punto di rifiuti.",
+  "label_trash_status_state_regular": "Questo è un trashpoint regolare.\n",
   "label_trash_status_state_cleaned": "Questo punto è pulito!",
   "label_trash_status_state_outdated": "Questo punto è obsoleto!",
   "label_TP_created_date": "Creato",
@@ -21,7 +21,7 @@
   "label_TP_by": " da ",
   "label_trash_amount_handful": "manciata",
   "label_trash_amount_bagful": "sacco pieno",
-  "label_trash_amount_cartloadl": "carrettata",
+  "label_trash_amount_cartloadl": "carrello",
   "label_trash_amount_truckload": "camion",
   "label_trash_type_plastic": "Plastica",
   "label_trash_type_metal": "Metallo",
@@ -36,11 +36,11 @@
   "label_button_tc_agree": "Accetto i Termini e le Condizioni",
   "label_header_map": "Mappa",
   "label_text_popover_subtitle": "Unisciti ad altre persone che stanno mappando i rifiuti!",
-  "label_text_popover_text": "Comincia a creare i punti di rifiuti e rende la tua comunità più pulita e sana.",
+  "label_text_popover_text": "Comincia a creare i trashpoint e rendi la tua comunità più pulita e sana.",
   "label_header_activity": "Le mie attività",
   "label_text_activity_empty_subtitle": "Niente da vedere qui!",
-  "label_text_activity_empty_text": "Non hai ancora aggiunto alcun punto di rifiuti. Quando lo farai, saranno elencati qui.",
-  "label_text_activity_empty_hint": "Aggiungi un punto di rifiuti!",
+  "label_text_activity_empty_text": "Non hai ancora aggiunto alcun trashpoint. Quando lo farai, saranno elencati qui.",
+  "label_text_activity_empty_hint": "Aggiungi un trashpoint!",
   "label_header_notific": "Notifiche",
   "label_text_notific_empty_subtitle": "Niente da vedere qui!",
   "label_text_notific_empty_text": "Non abbiamo ancora visto nessuna notifica, ma vi faremo sapere quando lo facciamo!",
@@ -52,79 +52,79 @@
   "label_text_select_country_hint": "Cerca",
   "label_button_tc": "Termini e Condizioni",
   "label_button_logout": "Termina la sessione",
-  "label_text_congrats_image": "Il rifiuto é catturato",
+  "label_text_congrats_image": "Rifiuto catturato",
   "label_text_congrats_subtitle": "Ottimo lavoro!",
   "label_text_congrats_text": "Ora salva il punto verificando i dati.",
-  "label_header_createTP": "Crea un punto di rifiuti",
+  "label_header_createTP": "Crea un trashpoint",
   "label_button_createTP_editloc": "Modifica la posizione",
   "label_header_edit_loc": "Modifica la posizione",
-  "label_button_edit_loc_set": "Imposta la posizione del punto di rifiuti",
+  "label_button_edit_loc_set": "Imposta la posizione del trashpoint",
   "label_text_createTP_status_subtitle": "Stato del punto",
-  "label_text_createTP_status_text": "Se è necessario un'azione rapida (tossici, metalli pesanti), si prega di impostare come un pericolo.",
-  "label_text_createTP_add_photos": "Aggiungi le foto di rifiuti",
+  "label_text_createTP_status_text": "Se è necessario un'azione rapida (tossici, metalli pesanti), si prega di impostare come una minaccia.",
+  "label_text_createTP_add_photos": "Aggiungi le foto dei rifiuti",
   "label_text_createTP_select_amount": "Selezionare la quantità di rifiuti",
   "label_text_createTP_select_type": "Selezionare il genere di rifiuti",
   "label_text_createTP_add_hashtags": "Ulteriore tag aggiunti",
   "label_text_createTP_add_hashtags_hint": "cioè.#marchio#lattine",
-  "label_button_createTP_confirm_create": "Crea un punto di rifiuti",
+  "label_button_createTP_confirm_create": "Crea un trashpoint",
   "label_alert_createTP_success": "Il punto di rifiuti e' stato creato con successo",
-  "label_text_detailsTP_photos": "Foto di rifiuti",
-  "label_text_detailsTP_amount": "Quantità di rifiuti",
-  "label_text_detailsTP_type": "Genere di rifiuti",
-  "label_text_editTP_ask": "L'informazione di questo punto di rifiuti é aggiornato e corretto?",
-  "label_text_editTP_letsconfirm": "Sì, lo confermo",
-  "label_alert_editTP_confirm": "Il punto di rifiuti e' stato creato con successo",
+  "label_text_detailsTP_photos": "Foto dei rifiuti",
+  "label_text_detailsTP_amount": "Quantità dei rifiuti",
+  "label_text_detailsTP_type": "Genere dei rifiuti",
+  "label_text_editTP_ask": "L'informazione di questo trashpoint é aggiornato e corretto?",
+  "label_text_editTP_letsconfirm": "Sì, confermo",
+  "label_alert_editTP_confirm": "Il trashpoint e' stato creato con successo",
   "label_text_editTP_letsedit": "No, modifichiamolo",
-  "label_header_editTP": "Modificare il punto di rifiuto",
-  "label_button_editTP_save": "Salve i cambiamenti del punto di rifiuti",
-  "label_alert_editTP_edit": "Il punto di rifiuti e' stato creato con successo",
-  "label_alert_editTP_delete": "Il punto di rifiuti e' stato cancellato con successo",
+  "label_header_editTP": "Modificare il trashpoint",
+  "label_button_editTP_save": "Salva i cambiamenti del trashpoint",
+  "label_alert_editTP_edit": "Il trashpoint è stato creato con successo",
+  "label_alert_editTP_delete": "Il trashpoint è stato cancellato con successo",
   "label_error_editTP_out_of_rng_subtitle": "Fuori portata",
   "label_error_editTP_out_of_rng_text": "Un punto può essere modificato solo se sei nel raggio di 100 metri.",
-  "label_error_saveTP_subtitle": "Salva il punto di rifiuto",
-  "label_error_saveTP_pic_and_type": "È più utile per noi se fai almeno una foto al punto di rifiuto e imposti la tipologia del rifiuto.",
-  "label_error_saveTP_picture": "È più utile per noi se fai almeno una foto al punto di rifiuto prima di salvare.",
-  "label_error_saveTP_trash_type": "È più utile per noi se imposti la tipologia del punto di rifiuti prima di salvare.",
-  "label_error_change_loc_subtitle": "Fuori dai limiti",
+  "label_error_saveTP_subtitle": "Salva il trashpoint",
+  "label_error_saveTP_pic_and_type": "È più utile per noi se fai almeno una foto al trashpoint e imposti la tipologia del rifiuto.",
+  "label_error_saveTP_picture": "È più utile per noi se fai almeno una foto al trashpoint prima di salvare.",
+  "label_error_saveTP_trash_type": "È più utile per noi se imposti la tipologia del trashpoint prima di salvare.",
+  "label_error_change_loc_subtitle": "Fuori campo",
   "label_error_change_loc_text": "Si prega di piazzare un punto in un raggio di 100 metri della posizione attuale.",
-  "label_error_generic_error_subtitle": "Fuori dai limiti",
+  "label_error_generic_error_subtitle": "Fuori campo",
   "label_error_generic_error_text": "C'è stato un errore sul server.",
   "label_error_network_subtitle": "Nessuna connessione di rete",
-  "label_error_network_text": "La data mobile è disabilitata. Attiva la data mobile o connetti il tuo cellulare al Wi-Fi per usare l'applicazione.",
+  "label_error_network_text": "I dati mobili sono disattivati. Abilita i dati mobili o connetti il tuo cellulare alla rete Wi-Fi per usare l'applicazione.",
   "label_error_location_subtitle": "Abilitare la geolocalizzazione",
-  "label_error_location_text": "Servizi di localizzazione sono disattivati. Si prega di attivare il GPS nell'impostazioni per utilizzare l'applicazione.",
-  "label_error_loc_permission_text": "Servizi di localizazzione non sono autorizzati. Si prega di lascarli in ordine per utilizzare l'applicazione.",
-  "label_trash_details_header": "Dettagli del punto di rifiuto",
+  "label_error_location_text": "I servizi di localizzazione sono disattivati. Attiva il GPS nelle Impostazioni per usare l'applicazione.",
+  "label_error_loc_permission_text": "Servizi di localizzazione non concessi. Si prega di abilitarli per utilizzare l'applicazione.",
+  "label_trash_details_header": "Dettagli del trashpoint",
   "label_privacy_policy_header": "Informativa sulla Privacy",
-  "label_about_header": "Riguarda o riferimento",
-  "label_edit_trashpoint_button": "Modificare il punto di rifiuto",
+  "label_about_header": "Riferimenti",
+  "label_edit_trashpoint_button": "Modificare il trashpoint",
   "label_100m_limit_modal": "Un punto può essere modificato solo se sei nel raggio di 100 metri da esso.",
   "label_retry_button": "Riprova",
   "label_country_picker_placeholder": "Scegli il tuo paese",
-  "label_camera_permission_warning_ios": "E' necessario modificare i permessi dell'accesso alla fotocamera. Per fare questo, vai su Impostazioni>Privacy>Fotocamera",
+  "label_camera_permission_warning_ios": "E' necessario modificare i permessi dell'accesso alla fotocamera. Per fare questo, vai su Impostazioni > Privacy > Fotocamera",
   "label_camera_permission_warning_android": "E' necessario modificare i permessi dell'accesso alla fotocamera. Per fare questo, vai su Impostazioni>Applicazioni",
-  "label_camera_error_title": "Negato l'accesso alla fotocamera",
+  "label_camera_error_title": "Accesso negato alla fotocamera",
   "label_error_modal_default_title": "Oh no!",
-  "label_error_modal_default_subtitle": "La whale fail ha rilevato un errpre del server!",
-  "label_location_permission_warning_ios": "È necessario modificare i permessi di localizazzione. Per fare questo, vai su Impostazioni > Privacy> Servizi di localizazzione.",
-  "label_location_permission_warning_android": "È necessario modificare i permessi di localizazzione. Per fare questo, vai su Impostazioni > applicazioni.",
-  "label_location_off_warning": "Servizi di localizzazione sono disattivati. Si prega di attivare il GPS nell'impostazioni per utilizzare l'applicazione.",
-  "label_location_modal_title": "Abilitare la localizzazione",
+  "label_error_modal_default_subtitle": "La balena ha rilevato un errore del server!",
+  "label_location_permission_warning_ios": "È necessario modificare i permessi di localizzazione. Per fare questo, vai su Impostazioni > Privacy> Servizi di localizzazione.",
+  "label_location_permission_warning_android": "È necessario modificare i permessi di localizzazione. Per fare questo, vai su Impostazioni > applicazioni.",
+  "label_location_off_warning": "I servizi di localizzazione sono disattivati. Attiva il GPS nelle Impostazioni per usare l'applicazione.",
+  "label_location_modal_title": "Abilitare la geolocalizzazione",
   "label_network_off_warning_title": "Nessuna connessione di rete",
-  "label_network_off_warning": "La data mobile è disabilitata. Attiva la data mobile o connetti il tuo cellulare al Wi-Fi per usare l'applicazione.",
+  "label_network_off_warning": "I dati mobili sono disattivati. Abilita i dati mobili o connetti il tuo cellulare alla rete Wi-Fi per usare l'applicazione.",
   "label_loading_image_text": "Ci siamo quasi...",
   "label_loading_image_subtext": "Si prega di attendere mentre salviamo le tue azioni.",
-  "label_create_marker_missing_photos": "Le marker photos potrebbe non essere caricate. Vi preghiamo di provare nuovamente ad aggiungerli.",
-  "label_edit_marker_missing_photos": "Le marker photos potrebbe non essere caricate. Vi preghiamo di provare nuovamente ad aggiungerli.",
-  "label_confirm_marker_missing_photos": "Le marker photos potrebbe non essere caricate. Si prega di riprovare ad aggiungerli.",
+  "label_create_marker_missing_photos": "Le foto segnaletiche potrebbero non essere state caricate. Vi preghiamo di aggiungerle di nuovo.",
+  "label_edit_marker_missing_photos": "Le foto segnaletiche potrebbero non essere state caricate. Vi preghiamo di aggiungerle di nuovo.",
+  "label_confirm_marker_missing_photos": "Le foto segnaletiche potrebbero non essere state caricate. Vi preghiamo di aggiungerle di nuovo.",
   "label_button_delete": "Elimina",
   "label_delete_photo_title": "Elimina la foto",
-  "label_delete_photo_subtitle": "Sei sicuro di che voler cancellare la foto? Non è possibile annullare questo.",
+  "label_delete_photo_subtitle": "Sei sicuro di voler eliminare la foto? Non puoi annullare questo.",
   "label_text_about_1": "Questa app è un iniziativa di Let's Do It World",
-  "label_text_about_2": "Tutti i dati che sono raccolti dagli utenti in tutto il mondo verranno visualizzati nella mappatura globale di rifiuti per l'avvio l'evento mondiale clean-up in World Cleanup Day, 15 Settembre 2018",
+  "label_text_about_2": "I dati raccolti dagli utenti di tutto il mondo verranno visualizzati nella mappa globale dei rifiuti per avviare eventi di Clean-Up in tutto il mondo nel World Cleanup Day, il 15 settembre 2018",
   "label_text_about_3": "Questa app è una collaborazione congiunta con",
-  "label_text_about_4": "Prodotti estone, sponsorizzati dal paese e dal governo",
-  "label_text_about_5": "Finanziatori: Ministero dell'ambiente Estone, Ministero degli affari esteri della Repubblica d'Estonia, Repubblica di Estonia 100 programmi",
-  "label_button_editTP_delete": "Cancella il punto di rifiuti",
+  "label_text_about_4": "Prodotto Estone, sponsorizzato dal paese e dal governo",
+  "label_text_about_5": "Finanziatori: Ministero dell'ambiente Estone, Ministero degli Affari Esteri della Repubblica d'Estonia, Repubblica d'Estonia 100 programmi",
+  "label_button_editTP_delete": "Cancella il trashpoint",
   "label_locked_account_warning": "Il tuo account è bloccato. Per ulteriori informazioni contattare un amministratore."
 }
\ No newline at end of file
diff --git a/mobile-app/src/trans/iu.json b/mobile-app/src/trans/iu.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/iu.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/jbo.json b/mobile-app/src/trans/jbo.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/jbo.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/kab.json b/mobile-app/src/trans/kab.json
new file mode 100644
index 0000000000..a8adf2b859
--- /dev/null
+++ b/mobile-app/src/trans/kab.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Yaw meṛṛa a nesizdget amaḍal!",
+  "label_button_facebook": "Kemmel ad Facebook",
+  "label_button_google": "Kemmel ad Google",
+  "label_button_try_app": "Ɛreḍ asnas mebla tiggezt",
+  "label_button_acknowledge": "Ih,dayen gziɣ!",
+  "label_button_cancel": "Sefsex",
+  "label_button_continue": "Kemmel",
+  "label_trash_status_threat": "Amihi",
+  "label_trash_status_regular": "tizeɣt",
+  "label_trash_status_cleaned": "yettwasizdeg",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "aseqdac",
+  "label_trash_status_change_location": "beddel adig",
+  "label_trash_status_state_threat": "Adig agi d-amihi !",
+  "label_trash_status_state_regular": "D-agudu tursaḍ n tizeɣt",
+  "label_trash_status_state_cleaned": "Agudu yagi yettwasizdeg!",
+  "label_trash_status_state_outdated": "Agudu yagi ur  yelli yara!",
+  "label_TP_created_date": "Yettwasnulfa",
+  "label_TP_updated_date": "Yettwalqem",
+  "label_TP_by": "s",
+  "label_trash_amount_handful": "Tummeẓt",
+  "label_trash_amount_bagful": "Ayen yellan deg tculiṭ",
+  "label_trash_amount_cartloadl": "Ayen yellan deg caryuy",
+  "label_trash_amount_truckload": "Taccaṛt n ukamyun",
+  "label_trash_type_plastic": "Plastik",
+  "label_trash_type_metal": "Ssini",
+  "label_trash_type_glass": "Asmaɣ",
+  "label_trash_type_electro": "Eliktṛunik",
+  "label_trash_type_paper": "Kaɣeḍ/Asɣaṛ",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/kdh.json b/mobile-app/src/trans/kdh.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/kdh.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/kg.json b/mobile-app/src/trans/kg.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/kg.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/kj.json b/mobile-app/src/trans/kj.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/kj.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/kok.json b/mobile-app/src/trans/kok.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/kok.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ks.json b/mobile-app/src/trans/ks.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ks.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/kv.json b/mobile-app/src/trans/kv.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/kv.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/kw.json b/mobile-app/src/trans/kw.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/kw.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/li.json b/mobile-app/src/trans/li.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/li.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/lij.json b/mobile-app/src/trans/lij.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/lij.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ln.json b/mobile-app/src/trans/ln.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ln.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/lt.json b/mobile-app/src/trans/lt.json
index 78344189bc..7a182cece9 100644
--- a/mobile-app/src/trans/lt.json
+++ b/mobile-app/src/trans/lt.json
@@ -1,130 +1,130 @@
 {
-  "label_text_app_subtitle": "Let's clean up the world together!",
-  "label_button_facebook": "Continue with Facebook",
-  "label_button_google": "Continue with Google",
-  "label_button_try_app": "Try out the app without account",
-  "label_button_acknowledge": "Ok, got it!",
-  "label_button_cancel": "Cancel",
-  "label_button_continue": "Continue",
-  "label_trash_status_threat": "threat",
-  "label_trash_status_regular": "regular",
-  "label_trash_status_cleaned": "cleaned",
-  "label_trash_status_outdated": "outdated",
-  "label_trash_status_user": "user",
-  "label_trash_status_change_location": "changeLocation",
-  "label_trash_status_state_threat": "This point is a threat!",
-  "label_trash_status_state_regular": "This is a regular trashpoint.",
-  "label_trash_status_state_cleaned": "This point is cleaned!",
-  "label_trash_status_state_outdated": "This point is outdated!",
-  "label_TP_created_date": "Created",
-  "label_TP_updated_date": "Updated",
-  "label_TP_by": " by ",
-  "label_trash_amount_handful": "handful",
-  "label_trash_amount_bagful": "bagful",
-  "label_trash_amount_cartloadl": "cartload",
-  "label_trash_amount_truckload": "truckload",
-  "label_trash_type_plastic": "Plastic",
-  "label_trash_type_metal": "Metal",
-  "label_trash_type_glass": "Glass",
-  "label_trash_type_electro": "Electronics",
-  "label_trash_type_paper": "Paper/Wood",
-  "label_trash_type_tyres": "Tyres",
-  "label_trash_type_dom_waste": "Domestic waste",
-  "label_trash_type_furniture": "Furniture",
-  "label_trash_type_org_waste": "Organic waste",
-  "label_header_tc": "Terms and Conditions",
-  "label_button_tc_agree": "I agree with the Terms & Conditions",
-  "label_header_map": "Map",
-  "label_text_popover_subtitle": "Join other people who are mapping trash!",
-  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
-  "label_header_activity": "My activity",
-  "label_text_activity_empty_subtitle": "Nothing to see here!",
-  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
-  "label_text_activity_empty_hint": "Add a trashpoint!",
-  "label_header_notific": "Notifications",
-  "label_text_notific_empty_subtitle": "Nothing to see here!",
-  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
-  "label_header_profile": "My profile",
-  "label_header_settings": "Account settings",
-  "label_button_country_empty": "Country",
-  "label_text_country": "Country",
-  "label_header_select_country": "Select a country",
-  "label_text_select_country_hint": "Search",
-  "label_button_tc": "Terms and Conditions",
-  "label_button_logout": "Log out",
-  "label_text_congrats_image": "Trash captured",
-  "label_text_congrats_subtitle": "Great job!",
-  "label_text_congrats_text": "Now save the point by verifying the data.",
-  "label_header_createTP": "Create a trashpoint",
-  "label_button_createTP_editloc": "Edit location",
-  "label_header_edit_loc": "Edit location",
-  "label_button_edit_loc_set": "Set trashpoint location",
-  "label_text_createTP_status_subtitle": "Point status",
-  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
-  "label_text_createTP_add_photos": "Add trash photos",
-  "label_text_createTP_select_amount": "Select trash amount",
-  "label_text_createTP_select_type": "Select trash type",
-  "label_text_createTP_add_hashtags": "Additional added tags",
-  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
-  "label_button_createTP_confirm_create": "Create trashpoint",
-  "label_alert_createTP_success": "Trashpoint successfully created",
-  "label_text_detailsTP_photos": "Trash photos",
-  "label_text_detailsTP_amount": "Trash amount",
-  "label_text_detailsTP_type": "Trash type",
-  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
-  "label_text_editTP_letsconfirm": "Yes, I confirm",
-  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
-  "label_text_editTP_letsedit": "No, let's edit",
-  "label_header_editTP": "Edit a trashpoint",
-  "label_button_editTP_save": "Save trashpoint changes",
-  "label_alert_editTP_edit": "Trashpoint successfully updated",
-  "label_alert_editTP_delete": "Trashpoint successfully deleted",
-  "label_error_editTP_out_of_rng_subtitle": "Out of range",
-  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
-  "label_error_saveTP_subtitle": "Save trashpoint",
-  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
-  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
-  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
-  "label_error_change_loc_subtitle": "Out of bounds",
-  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
-  "label_error_generic_error_subtitle": "Out of bounds",
-  "label_error_generic_error_text": "There was an error on the server.",
-  "label_error_network_subtitle": "No network connection",
-  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_error_location_subtitle": "Enable location",
-  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
-  "label_trash_details_header": "Trashpoint details",
-  "label_privacy_policy_header": "Privacy Policy",
-  "label_about_header": "About",
-  "label_edit_trashpoint_button": "Edit trashpoint",
-  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
-  "label_retry_button": "Retry",
-  "label_country_picker_placeholder": "Choose your country",
-  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
-  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
-  "label_camera_error_title": "Camera Access Denied",
-  "label_error_modal_default_title": "Oh noes!",
-  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
-  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
-  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
-  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_location_modal_title": "Enable location",
-  "label_network_off_warning_title": "No network connection",
-  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_loading_image_text": "Almost there...",
-  "label_loading_image_subtext": "Please wait while we save your actions.",
-  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_button_delete": "Delete",
-  "label_delete_photo_title": "Delete photo",
-  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
-  "label_text_about_1": "This app is an initiative by Let's Do It World",
-  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
-  "label_text_about_3": "This app is a joint cooperation with",
-  "label_text_about_4": "Estonian product, sponsored by the country and government",
-  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
-  "label_button_editTP_delete": "Delete trashpoint",
-  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+  "label_text_app_subtitle": "Sutvarkykime pasaulį kartu!",
+  "label_button_facebook": "Tęsti su Facebook",
+  "label_button_google": "Tęsti su Google",
+  "label_button_try_app": "Išbandyti programėlę be registracijos",
+  "label_button_acknowledge": "Supratau!",
+  "label_button_cancel": "Atšaukti",
+  "label_button_continue": "Tęsti",
+  "label_trash_status_threat": "pavojinga",
+  "label_trash_status_regular": "įprasta",
+  "label_trash_status_cleaned": "sutvarkytas",
+  "label_trash_status_outdated": "pasenęs",
+  "label_trash_status_user": "vartotojas",
+  "label_trash_status_change_location": "pakeisti vietą",
+  "label_trash_status_state_threat": "Ši vieta yra pavojinga!",
+  "label_trash_status_state_regular": "Įprastų šiukšlių vieta.",
+  "label_trash_status_state_cleaned": "Ši vieta jau išvalyta!",
+  "label_trash_status_state_outdated": "Šis taškas nebegalioja!",
+  "label_TP_created_date": "Sukurta",
+  "label_TP_updated_date": "Atnaujinta",
+  "label_TP_by": " ",
+  "label_trash_amount_handful": "sauja",
+  "label_trash_amount_bagful": "maišas",
+  "label_trash_amount_cartloadl": "karutis",
+  "label_trash_amount_truckload": "sunkvežimis",
+  "label_trash_type_plastic": "Plastikas",
+  "label_trash_type_metal": "Metalas",
+  "label_trash_type_glass": "Stiklas",
+  "label_trash_type_electro": "Elektronika",
+  "label_trash_type_paper": "Popierius/Mediena",
+  "label_trash_type_tyres": "Padangos",
+  "label_trash_type_dom_waste": "Buitinės atliekos",
+  "label_trash_type_furniture": "Baldai",
+  "label_trash_type_org_waste": "Organinės atliekos",
+  "label_header_tc": "Taisyklės ir Sąlygos",
+  "label_button_tc_agree": "Aš sutinku su Taisyklėmis ir Sąlygomis",
+  "label_header_map": "Žemėlapis",
+  "label_text_popover_subtitle": "Prisijunk prie kitų, kurie žymi šiukšles žemėlapyje!",
+  "label_text_popover_text": "Pradėk žymėti šiukšlių taškus, kad paverstum bendruomenę švaresne ir sveikesne.",
+  "label_header_activity": "Mano veikla",
+  "label_text_activity_empty_subtitle": "Deja, čia tuščia!",
+  "label_text_activity_empty_text": "Jūs dar nepridėjote šiukšlių taškų. Kai tai padarysite, jie atsiras čia.",
+  "label_text_activity_empty_hint": "Pridėti šiukšlių tašką!",
+  "label_header_notific": "Pranešimai",
+  "label_text_notific_empty_subtitle": "Deja, čia tuščia!",
+  "label_text_notific_empty_text": "Kol kas pranešimų nėra, mes pranešime kai jų atsiras!",
+  "label_header_profile": "Mano profilis",
+  "label_header_settings": "Paskyros nustatymai",
+  "label_button_country_empty": "Šalis",
+  "label_text_country": "Šalis",
+  "label_header_select_country": "Pasirinkti šalį",
+  "label_text_select_country_hint": "Paieška",
+  "label_button_tc": "Taisyklės ir Sąlygos",
+  "label_button_logout": "Atsijungti",
+  "label_text_congrats_image": "Šiukšlės nufotografuotos",
+  "label_text_congrats_subtitle": "Puiku!",
+  "label_text_congrats_text": "Išsaugokite tašką patvirtindami duomenis apie jį.",
+  "label_header_createTP": "Sukurti šiukšlių tašką",
+  "label_button_createTP_editloc": "Redaguoti vietą",
+  "label_header_edit_loc": "Redaguoti vietą",
+  "label_button_edit_loc_set": "Nustatyti šiukšlių taško vietą",
+  "label_text_createTP_status_subtitle": "Taško būsena",
+  "label_text_createTP_status_text": "Jei reikia veikti nedelsiant (nuodinga, sunkieji metalai) nustatykite kaip pavojinga.",
+  "label_text_createTP_add_photos": "Pridėkite šiukšlių nuotraukų",
+  "label_text_createTP_select_amount": "Pasirinkite šiukšlių kiekį",
+  "label_text_createTP_select_type": "Pasirinkite šiukšlių tipą",
+  "label_text_createTP_add_hashtags": "Papildomos žymos",
+  "label_text_createTP_add_hashtags_hint": "pvz. #gamintojas, #skardinės",
+  "label_button_createTP_confirm_create": "Sukurti šiukšlių tašką",
+  "label_alert_createTP_success": "Šiukšlių taškas sėkmingai sukurtas",
+  "label_text_detailsTP_photos": "Šiukšlių nuotraukos",
+  "label_text_detailsTP_amount": "Šiukšlių kiekis",
+  "label_text_detailsTP_type": "Šiukšlių rūšis",
+  "label_text_editTP_ask": "Ar ši šiukšlių taško informacija vis dar teisinga?",
+  "label_text_editTP_letsconfirm": "Taip, patvirtinu",
+  "label_alert_editTP_confirm": "Šiukšlių taškas sėkmingai patvirtintas",
+  "label_text_editTP_letsedit": "Ne, redaguoti",
+  "label_header_editTP": "Redaguoti šiukšlių tašką",
+  "label_button_editTP_save": "Išsaugoti šiukšlių taško pakeitimus",
+  "label_alert_editTP_edit": "Šiukšlių taškas sėkmingai atnaujintas",
+  "label_alert_editTP_delete": "Šiukšlių taškas sėkmingai ištrintas",
+  "label_error_editTP_out_of_rng_subtitle": "Nepasiekiamas",
+  "label_error_editTP_out_of_rng_text": "Šiukšlių tašką galite redaguoti, jei esate nutolęs nuo jo ne daugiau nei 100 metrų.",
+  "label_error_saveTP_subtitle": "Išsaugoti šiukšlių tašką",
+  "label_error_saveTP_pic_and_type": "Įkelkite bent vieną šiukšlių taško nuotrauką ir nurodykite jų rūšį.",
+  "label_error_saveTP_picture": "Prieš išsaugant įkelkite bent vieną šiukšlių taško nuotrauką.",
+  "label_error_saveTP_trash_type": "Prieš išsaugant nurodykite šiukšlių rūšį.",
+  "label_error_change_loc_subtitle": "Už ribų",
+  "label_error_change_loc_text": "Pažymėkite šiukšlių tašką 100 metrų atstumu.",
+  "label_error_generic_error_subtitle": "Už ribų",
+  "label_error_generic_error_text": "Serverio klaida.",
+  "label_error_network_subtitle": "Nėra interneto ryšio",
+  "label_error_network_text": "Mobilieji duomenys išjungti. Jei norite naudoti programėlę, įjunkite mobiliuosius duomenis arba prijunkite telefoną prie \"Wi-Fi\" tinklo.",
+  "label_error_location_subtitle": "Įjungti vietos nustatymą",
+  "label_error_location_text": "Vietos nustatymo paslauga išjungta. Įjunkite GPS funkciją, kad galėtumėte naudotis šia programėle.",
+  "label_error_loc_permission_text": "Vietos nustatymo paslauga negalima. Įjunkite ją, jei norite naudotis šia programa.",
+  "label_trash_details_header": "Šiukšlių taško informacija",
+  "label_privacy_policy_header": "Privatumo politika",
+  "label_about_header": "Apie",
+  "label_edit_trashpoint_button": "Redaguoti šiukšlių tašką",
+  "label_100m_limit_modal": "Šiukšlių tašką galite redaguoti jei esate nutolęs nuo jo ne daugiau nei 100 metrų.",
+  "label_retry_button": "Bandykite dar kartą",
+  "label_country_picker_placeholder": "Pasirinkite šalį",
+  "label_camera_permission_warning_ios": "Pakeiskite fotoaparato prieigos nustatymus. Norėdami tai padaryti, eikite į Nustatymai>Privatumas>Fotoaparatas",
+  "label_camera_permission_warning_android": "Pakeiskite fotoaparato prieigos nustatymus. Norėdami tai padaryti, eikite į Nustatymai>Aplikacijos",
+  "label_camera_error_title": "Prieiga prie fotoaparato negalima",
+  "label_error_modal_default_title": "O ne!",
+  "label_error_modal_default_subtitle": "Aptikta serverio klaida!",
+  "label_location_permission_warning_ios": "Įjunkite vietos nustatymo funkciją. Norėdami tai padaryti, eikite į Nustatymai>Privatumas>Vietos nustatymo paslauga.",
+  "label_location_permission_warning_android": "Įjunkite vietos nustatymo funkciją. Norėdami tai padaryti, eikite į Parametrai > Aplikacijos.",
+  "label_location_off_warning": "Vietos nustatymo paslauga išjungta. Įjunkite GPS funkciją, kad galėtumėte naudotis šia programėle.",
+  "label_location_modal_title": "Įjungti vietos nustatymą",
+  "label_network_off_warning_title": "Nėra interneto ryšio",
+  "label_network_off_warning": "Mobilieji duomenys išjungti. Jei norite naudoti programėlę, įjunkite mobiliuosius duomenis arba prijunkite telefoną prie \"Wi-Fi\" tinklo.",
+  "label_loading_image_text": "Jau beveik...",
+  "label_loading_image_subtext": "Palaukite, kol bus išsaugoti jūsų veiksmai.",
+  "label_create_marker_missing_photos": "Nepavyko įkelti pasirinktų nuotraukų. Pabandykite jas įkelti dar kartą.",
+  "label_edit_marker_missing_photos": "Nepavyko įkelti pasirinktų nuotraukų. Pabandykite jas įkelti dar kartą.",
+  "label_confirm_marker_missing_photos": "Nepavyko įkelti pasirinktų nuotraukų. Pabandykite jas įkelti dar kartą.",
+  "label_button_delete": "Ištrinti",
+  "label_delete_photo_title": "Ištrinti nuotrauką",
+  "label_delete_photo_subtitle": "Ar tikrai norite ištrinti šią nuotrauką? ",
+  "label_text_about_1": "Ši programėlė yra sukurta Let's Do It World iniciatyva",
+  "label_text_about_2": "Visi pasauliniu mastu surinkti duomenys bus pavaizduoti pasauliniame šiukšlių žemėlapyje, skirtame inicijuoti tvarkymosi renginius per World Cleanup Day 2018 m. rugsėjo 15 d.",
+  "label_text_about_3": "Ši programėlė sukurta bendradarbiaujant su",
+  "label_text_about_4": "Pagaminta Estijoje su šalies ir vyriausybės parama",
+  "label_text_about_5": "Rėmėjai: Estijos aplinkos ministerija, Estijos Respublikos užsienio reikalų ministerija, programa Estijos Respublikai 100",
+  "label_button_editTP_delete": "Ištrinti šiukšlių tašką",
+  "label_locked_account_warning": "Jūsų paskyra užblokuota. Susisiekite su administratoriumi."
 }
\ No newline at end of file
diff --git a/mobile-app/src/trans/luy.json b/mobile-app/src/trans/luy.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/luy.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/lv.json b/mobile-app/src/trans/lv.json
index 3ad4df9a78..9f39d775dc 100644
--- a/mobile-app/src/trans/lv.json
+++ b/mobile-app/src/trans/lv.json
@@ -47,7 +47,7 @@
   "label_header_profile": "Mans profils",
   "label_header_settings": "Account settings",
   "label_button_country_empty": "Valsts",
-  "label_text_country": "Country",
+  "label_text_country": "Valsts",
   "label_header_select_country": "Izvēlieties valsti",
   "label_text_select_country_hint": "Search",
   "label_button_tc": "Terms and Conditions",
diff --git a/mobile-app/src/trans/mai.json b/mobile-app/src/trans/mai.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/mai.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/me.json b/mobile-app/src/trans/me.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/me.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/mg.json b/mobile-app/src/trans/mg.json
index 488633294e..55012225f7 100644
--- a/mobile-app/src/trans/mg.json
+++ b/mobile-app/src/trans/mg.json
@@ -111,7 +111,7 @@
   "label_location_off_warning": "Vietos nustatymo paslauga išjungta. Įjunkite GPS funkciją, kad galėtumėte naudotis šia aplikacija.",
   "label_location_modal_title": "Enable location",
   "label_network_off_warning_title": "Nėra interneto ryšio",
-  "label_network_off_warning": "Mobilieji duomenys išjungti. Jei norite naudoti programą, įjunkite mobiliuosius duomenis arba prisijunkite prie \"Wi-Fi\" tinklo.",
+  "label_network_off_warning": "Mobilieji duomenys išjungti. Jei norite naudoti programą, įjunkite mobiliuosius duomenis arba prijunkite telefoną prie \"Wi-Fi\" tinklo.",
   "label_loading_image_text": "Netrukus pasieksite savo tikslo vietą",
   "label_loading_image_subtext": "Palaukite, kol bus išsaugoti jūsų veiksmai.",
   "label_create_marker_missing_photos": "Nepavyko įkelti pasirinktų nuotraukų. Pabandykite jas įkelti dar kartą.",
diff --git a/mobile-app/src/trans/mh.json b/mobile-app/src/trans/mh.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/mh.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/mk.json b/mobile-app/src/trans/mk.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/mk.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ml.json b/mobile-app/src/trans/ml.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ml.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/moh.json b/mobile-app/src/trans/moh.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/moh.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/mos.json b/mobile-app/src/trans/mos.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/mos.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/mr.json b/mobile-app/src/trans/mr.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/mr.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ms.json b/mobile-app/src/trans/ms.json
index 5319dc98ce..2ad4468259 100644
--- a/mobile-app/src/trans/ms.json
+++ b/mobile-app/src/trans/ms.json
@@ -7,7 +7,7 @@
   "label_button_cancel": "Batal",
   "label_button_continue": "Terus",
   "label_trash_status_threat": "ancaman",
-  "label_trash_status_regular": "regular",
+  "label_trash_status_regular": "biasa",
   "label_trash_status_cleaned": "dibersihkan",
   "label_trash_status_outdated": "outdated",
   "label_trash_status_user": "pengguna",
@@ -50,7 +50,7 @@
   "label_text_country": "Negara",
   "label_header_select_country": "Pilih satu negara",
   "label_text_select_country_hint": "Search",
-  "label_button_tc": "Terms and Conditions",
+  "label_button_tc": "Terma dan Syarat",
   "label_button_logout": "Log out",
   "label_text_congrats_image": "Trash captured",
   "label_text_congrats_subtitle": "Great job!",
diff --git a/mobile-app/src/trans/my.json b/mobile-app/src/trans/my.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/my.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ng.json b/mobile-app/src/trans/ng.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ng.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/nl.json b/mobile-app/src/trans/nl.json
index 78344189bc..676b0439b4 100644
--- a/mobile-app/src/trans/nl.json
+++ b/mobile-app/src/trans/nl.json
@@ -1,130 +1,130 @@
 {
   "label_text_app_subtitle": "Let's clean up the world together!",
-  "label_button_facebook": "Continue with Facebook",
-  "label_button_google": "Continue with Google",
-  "label_button_try_app": "Try out the app without account",
-  "label_button_acknowledge": "Ok, got it!",
-  "label_button_cancel": "Cancel",
-  "label_button_continue": "Continue",
-  "label_trash_status_threat": "threat",
-  "label_trash_status_regular": "regular",
-  "label_trash_status_cleaned": "cleaned",
-  "label_trash_status_outdated": "outdated",
-  "label_trash_status_user": "user",
-  "label_trash_status_change_location": "changeLocation",
-  "label_trash_status_state_threat": "This point is a threat!",
-  "label_trash_status_state_regular": "This is a regular trashpoint.",
-  "label_trash_status_state_cleaned": "This point is cleaned!",
-  "label_trash_status_state_outdated": "This point is outdated!",
-  "label_TP_created_date": "Created",
-  "label_TP_updated_date": "Updated",
-  "label_TP_by": " by ",
-  "label_trash_amount_handful": "handful",
-  "label_trash_amount_bagful": "bagful",
-  "label_trash_amount_cartloadl": "cartload",
-  "label_trash_amount_truckload": "truckload",
-  "label_trash_type_plastic": "Plastic",
-  "label_trash_type_metal": "Metal",
-  "label_trash_type_glass": "Glass",
-  "label_trash_type_electro": "Electronics",
-  "label_trash_type_paper": "Paper/Wood",
-  "label_trash_type_tyres": "Tyres",
-  "label_trash_type_dom_waste": "Domestic waste",
-  "label_trash_type_furniture": "Furniture",
-  "label_trash_type_org_waste": "Organic waste",
-  "label_header_tc": "Terms and Conditions",
-  "label_button_tc_agree": "I agree with the Terms & Conditions",
-  "label_header_map": "Map",
-  "label_text_popover_subtitle": "Join other people who are mapping trash!",
-  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
-  "label_header_activity": "My activity",
-  "label_text_activity_empty_subtitle": "Nothing to see here!",
-  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
-  "label_text_activity_empty_hint": "Add a trashpoint!",
-  "label_header_notific": "Notifications",
-  "label_text_notific_empty_subtitle": "Nothing to see here!",
-  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
-  "label_header_profile": "My profile",
-  "label_header_settings": "Account settings",
-  "label_button_country_empty": "Country",
-  "label_text_country": "Country",
-  "label_header_select_country": "Select a country",
-  "label_text_select_country_hint": "Search",
-  "label_button_tc": "Terms and Conditions",
-  "label_button_logout": "Log out",
-  "label_text_congrats_image": "Trash captured",
-  "label_text_congrats_subtitle": "Great job!",
-  "label_text_congrats_text": "Now save the point by verifying the data.",
-  "label_header_createTP": "Create a trashpoint",
-  "label_button_createTP_editloc": "Edit location",
-  "label_header_edit_loc": "Edit location",
-  "label_button_edit_loc_set": "Set trashpoint location",
-  "label_text_createTP_status_subtitle": "Point status",
-  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
-  "label_text_createTP_add_photos": "Add trash photos",
-  "label_text_createTP_select_amount": "Select trash amount",
-  "label_text_createTP_select_type": "Select trash type",
-  "label_text_createTP_add_hashtags": "Additional added tags",
-  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
-  "label_button_createTP_confirm_create": "Create trashpoint",
-  "label_alert_createTP_success": "Trashpoint successfully created",
-  "label_text_detailsTP_photos": "Trash photos",
-  "label_text_detailsTP_amount": "Trash amount",
-  "label_text_detailsTP_type": "Trash type",
-  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
-  "label_text_editTP_letsconfirm": "Yes, I confirm",
-  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
-  "label_text_editTP_letsedit": "No, let's edit",
-  "label_header_editTP": "Edit a trashpoint",
-  "label_button_editTP_save": "Save trashpoint changes",
-  "label_alert_editTP_edit": "Trashpoint successfully updated",
-  "label_alert_editTP_delete": "Trashpoint successfully deleted",
-  "label_error_editTP_out_of_rng_subtitle": "Out of range",
-  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
-  "label_error_saveTP_subtitle": "Save trashpoint",
-  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
-  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
-  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_button_facebook": "Ga door met Facebook",
+  "label_button_google": "Ga door met Google",
+  "label_button_try_app": "Probeer de app zonder account",
+  "label_button_acknowledge": "Ok, ik snap het!",
+  "label_button_cancel": "Stoppen",
+  "label_button_continue": "Doorgaan",
+  "label_trash_status_threat": "bedreiging",
+  "label_trash_status_regular": "regelmatig",
+  "label_trash_status_cleaned": "schoongemaakt",
+  "label_trash_status_outdated": "verouderd",
+  "label_trash_status_user": "gebruiker",
+  "label_trash_status_change_location": "Verander locatie",
+  "label_trash_status_state_threat": "Dit punt is een bedreiging!",
+  "label_trash_status_state_regular": "Dit is een regelmatig afvalpunt.",
+  "label_trash_status_state_cleaned": "Dit punt is schoongemaakt!",
+  "label_trash_status_state_outdated": "Dit punt is verouderd!",
+  "label_TP_created_date": "Gemaakt",
+  "label_TP_updated_date": "Bijgewerkt",
+  "label_TP_by": " door ",
+  "label_trash_amount_handful": "handvol",
+  "label_trash_amount_bagful": "volle zak",
+  "label_trash_amount_cartloadl": "karlading",
+  "label_trash_amount_truckload": "vrachtwagenlading",
+  "label_trash_type_plastic": "Kunststof",
+  "label_trash_type_metal": "Metaal",
+  "label_trash_type_glass": "Glas",
+  "label_trash_type_electro": "Elektronica",
+  "label_trash_type_paper": "Papier/hout",
+  "label_trash_type_tyres": "Banden",
+  "label_trash_type_dom_waste": "Huishoudelijk afval",
+  "label_trash_type_furniture": "Meubilair",
+  "label_trash_type_org_waste": "Organisch afval",
+  "label_header_tc": "Algemene voorwaarden",
+  "label_button_tc_agree": "Ik ga akkoord met de algemene voorwaarden",
+  "label_header_map": "Kaart",
+  "label_text_popover_subtitle": "Doe mee met andere mensen die afval in kaart brengen!",
+  "label_text_popover_text": "Begin met het maken van afvalpunten om uw gemeenschap schoner en gezonder te maken.",
+  "label_header_activity": "Mijn activiteit",
+  "label_text_activity_empty_subtitle": "Niets te zien hier!",
+  "label_text_activity_empty_text": "U heb nog geen afvalpunten nog toegevoegd. Wanneer u dit doet, zullen ze hier getoond worden.",
+  "label_text_activity_empty_hint": "Voeg een afvalpunt toe!",
+  "label_header_notific": "Meldingen",
+  "label_text_notific_empty_subtitle": "Niets te zien hier!",
+  "label_text_notific_empty_text": "We hebben nog geen meldingen zien binnenkomen, maar we laten je het weten zodra dat wel gebeurt!",
+  "label_header_profile": "Mijn profiel",
+  "label_header_settings": "Accountinstellingen",
+  "label_button_country_empty": "Land",
+  "label_text_country": "Land",
+  "label_header_select_country": "Selecteer een land",
+  "label_text_select_country_hint": "Zoek",
+  "label_button_tc": "Algemene voorwaarden",
+  "label_button_logout": "Uitloggen",
+  "label_text_congrats_image": "Afval vastgelegd",
+  "label_text_congrats_subtitle": "Goed gedaan!",
+  "label_text_congrats_text": "Sla nu het punt op door de gegevens te controleren.",
+  "label_header_createTP": "Een afvalpunt maken",
+  "label_button_createTP_editloc": "Bewerk locatie",
+  "label_header_edit_loc": "Bewerk locatie",
+  "label_button_edit_loc_set": "Afval locatie instellen",
+  "label_text_createTP_status_subtitle": "Status van het punt",
+  "label_text_createTP_status_text": "Als een snelle actie is nodig (giftig, zware metalen), stel a.u.b. in als bedreiging.",
+  "label_text_createTP_add_photos": "Afval foto's toevoegen",
+  "label_text_createTP_select_amount": "Selecteer hoeveelheid afval",
+  "label_text_createTP_select_type": "Selecteer soort afval",
+  "label_text_createTP_add_hashtags": "Extra toegevoegde tags",
+  "label_text_createTP_add_hashtags_hint": "Bijv. #merknaam, #blikjes",
+  "label_button_createTP_confirm_create": "Een afvalpunt maken",
+  "label_alert_createTP_success": "Afvalpunt met succes gemaakt",
+  "label_text_detailsTP_photos": "Afval foto's",
+  "label_text_detailsTP_amount": "Hoeveelheid afval",
+  "label_text_detailsTP_type": "Afval soort",
+  "label_text_editTP_ask": "Zijn de afvalpunt gegevens nog steeds correct en up-to-date?",
+  "label_text_editTP_letsconfirm": "Ja, ik bevestig",
+  "label_alert_editTP_confirm": "Afvalpunt met succes bevestigd",
+  "label_text_editTP_letsedit": "Nee, laten we het aanpassen",
+  "label_header_editTP": "Wijzig een afvalpunt",
+  "label_button_editTP_save": "Afvalpunt wijzigingen opslaan",
+  "label_alert_editTP_edit": "Afvalpunt met succes aangepast",
+  "label_alert_editTP_delete": "Afvalpunt met succes verwijderd",
+  "label_error_editTP_out_of_rng_subtitle": "Buiten het bereik",
+  "label_error_editTP_out_of_rng_text": "Een punt kan alleen worden gewijzigd als u zich binnen 100 meter daarvan bevindt.",
+  "label_error_saveTP_subtitle": "Afvalpunt opslaan",
+  "label_error_saveTP_pic_and_type": "Het is nuttiger voor ons, als ten minste één foto neemt van het afvalpunt en het soort afval instelt.",
+  "label_error_saveTP_picture": "Het is nuttiger voor ons als u ten minste één foto van het afvalpunt neemt alvorens op te slaan.",
+  "label_error_saveTP_trash_type": "Het is nuttiger voor ons, als u het afvalpunt soort voor opslaan instelt.",
   "label_error_change_loc_subtitle": "Out of bounds",
-  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_change_loc_text": "Plaats een punt binnen 100 meter van uw locatie.",
   "label_error_generic_error_subtitle": "Out of bounds",
-  "label_error_generic_error_text": "There was an error on the server.",
-  "label_error_network_subtitle": "No network connection",
-  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_error_location_subtitle": "Enable location",
-  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
-  "label_trash_details_header": "Trashpoint details",
-  "label_privacy_policy_header": "Privacy Policy",
-  "label_about_header": "About",
-  "label_edit_trashpoint_button": "Edit trashpoint",
-  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
-  "label_retry_button": "Retry",
-  "label_country_picker_placeholder": "Choose your country",
-  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
-  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
-  "label_camera_error_title": "Camera Access Denied",
-  "label_error_modal_default_title": "Oh noes!",
-  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
-  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
-  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
-  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_location_modal_title": "Enable location",
-  "label_network_off_warning_title": "No network connection",
-  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_loading_image_text": "Almost there...",
-  "label_loading_image_subtext": "Please wait while we save your actions.",
-  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_button_delete": "Delete",
-  "label_delete_photo_title": "Delete photo",
-  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
-  "label_text_about_1": "This app is an initiative by Let's Do It World",
-  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
-  "label_text_about_3": "This app is a joint cooperation with",
-  "label_text_about_4": "Estonian product, sponsored by the country and government",
-  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
-  "label_button_editTP_delete": "Delete trashpoint",
-  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+  "label_error_generic_error_text": "Er is een fout opgetreden op de server.",
+  "label_error_network_subtitle": "Geen netwerkverbinding",
+  "label_error_network_text": "Mobiel dataverkeer is uitgeschakeld. Schakel deze in of verbind de telefoon met Wi-Fi om de toepassing te gebruiken.",
+  "label_error_location_subtitle": "Locatie inschakelen",
+  "label_error_location_text": "Locatieservices zijn uitgeschakeld. Activeer uw GPS in uw instellingen om de toepassing te gebruiken.",
+  "label_error_loc_permission_text": "Locatieservices zijn niet toegestaan. Gelieve deze toe te laten om de toepassing te gebruiken.",
+  "label_trash_details_header": "Afvalpunt details",
+  "label_privacy_policy_header": "Privacybeleid",
+  "label_about_header": "Over",
+  "label_edit_trashpoint_button": "Voeg een afvalpunt toe",
+  "label_100m_limit_modal": "Een punt kan alleen worden gewijzigd als u zich binnen 100 meter daarvan bevindt.",
+  "label_retry_button": "Opnieuw proberen",
+  "label_country_picker_placeholder": "Kies uw land",
+  "label_camera_permission_warning_ios": "U moet camera toegangsmachtigingen wijzigen. Om dit te doen, ga naar instellingen > Privacy > Camera",
+  "label_camera_permission_warning_android": "U moet camera toegangsmachtigingen wijzigen. Om dit te doen, ga naar instellingen > Apps",
+  "label_camera_error_title": "Camera toegang geweigerd",
+  "label_error_modal_default_title": "Oh nee!",
+  "label_error_modal_default_subtitle": "De fail-walvis heeft een serverfout ontdekt!",
+  "label_location_permission_warning_ios": "U moet de locatie machtigingen wijzigen. Om dit te doen, ga naar instellingen > Privacy > locatievoorzieningen.",
+  "label_location_permission_warning_android": "U moet de locatie machtigingen wijzigen. Om dit te doen, ga naar instellingen > Apps.",
+  "label_location_off_warning": "Locatieservices zijn uitgeschakeld. Activeer uw GPS in uw instellingen om de toepassing te gebruiken.",
+  "label_location_modal_title": "Locatie inschakelen",
+  "label_network_off_warning_title": "Geen netwerkverbinding",
+  "label_network_off_warning": "Mobiel dataverkeer is uitgeschakeld. Schakel deze in of verbind de telefoon met Wi-Fi om de toepassing te gebruiken.",
+  "label_loading_image_text": "We zijn er bijna...",
+  "label_loading_image_subtext": "Een moment geduld a.u.b. terwijl we uw acties opslaan.",
+  "label_create_marker_missing_photos": "De marker foto's kunnen niet worden geüpload. Gelieve te proberen hen opnieuw toe te voegen.",
+  "label_edit_marker_missing_photos": "De marker foto's kunnen niet worden geüpload. Gelieve te proberen hen opnieuw toe te voegen.",
+  "label_confirm_marker_missing_photos": "De marker foto's kunnen niet worden geüpload. Gelieve te proberen hen opnieuw toe te voegen.",
+  "label_button_delete": "Verwijderen",
+  "label_delete_photo_title": "Foto verwijderen",
+  "label_delete_photo_subtitle": "Weet u zeker dat u de foto wil verwijderen? U niet dit ongedaan maken.",
+  "label_text_about_1": "Deze app is een initiatief van Let's Do It World",
+  "label_text_about_2": "Alle gegevens die zijn verzameld door gebruikers wereldwijd zal worden gevisualiseerd in de wereldwijde afval-kaart voor het initiëren van wereldwijde schoonmaak evenementen op World Cleanup dag, 15 September 2018",
+  "label_text_about_3": "Dit app is een samenwerking met",
+  "label_text_about_4": "Een product uit Estland, gesponsord door het land en de regering",
+  "label_text_about_5": "Financiers: Estse ministerie van milieu, het ministerie van buitenlandse zaken van de Republiek Estland, het 100 programma van de Estse Republiek",
+  "label_button_editTP_delete": "Afvalpunt verwijderen",
+  "label_locked_account_warning": "Uw account is geblokkeerd. Neem contact op met de beheerder voor meer informatie."
 }
\ No newline at end of file
diff --git a/mobile-app/src/trans/ny.json b/mobile-app/src/trans/ny.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ny.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/oc.json b/mobile-app/src/trans/oc.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/oc.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/oj.json b/mobile-app/src/trans/oj.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/oj.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/om.json b/mobile-app/src/trans/om.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/om.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/or.json b/mobile-app/src/trans/or.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/or.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/os.json b/mobile-app/src/trans/os.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/os.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/pa.json b/mobile-app/src/trans/pa.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/pa.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/pam.json b/mobile-app/src/trans/pam.json
new file mode 100644
index 0000000000..ae23cdd99d
--- /dev/null
+++ b/mobile-app/src/trans/pam.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Linisin natin ang mundo ng sama-sama!",
+  "label_button_facebook": "Magpatuloy gamit ang Facebook",
+  "label_button_google": "Magpatuloy gamita ang Google",
+  "label_button_try_app": "Subukan ang mga app ng walang account",
+  "label_button_acknowledge": "Ok, nakuha ko!",
+  "label_button_cancel": "Kanselahin",
+  "label_button_continue": "Magpatuloy",
+  "label_trash_status_threat": "banta",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "nalinis na",
+  "label_trash_status_outdated": "lipas na sa panahon",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "baguhin ang Lokasyon",
+  "label_trash_status_state_threat": "Ang puntong ito ay isang banta!",
+  "label_trash_status_state_regular": "Ito ay isang regular na trashpoint.",
+  "label_trash_status_state_cleaned": "Ang lugar na ito ay nalinis na!",
+  "label_trash_status_state_outdated": "Ang lugar na ito ay lipas na sa panahon!",
+  "label_TP_created_date": "Nalikha na",
+  "label_TP_updated_date": "Na-update na",
+  "label_TP_by": " mula kay ",
+  "label_trash_amount_handful": "isang dakot",
+  "label_trash_amount_bagful": "isang supot",
+  "label_trash_amount_cartloadl": "isang kariton",
+  "label_trash_amount_truckload": "isang trak",
+  "label_trash_type_plastic": "Plastik",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Salamin",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Papel/Kahoy",
+  "label_trash_type_tyres": "Mga gulong",
+  "label_trash_type_dom_waste": "Basurang mula sa tahanan",
+  "label_trash_type_furniture": "Kasangkapan sa bahay",
+  "label_trash_type_org_waste": "Basurang organiko",
+  "label_header_tc": "Mga tuntunin at kondisyon",
+  "label_button_tc_agree": "Sumasang-ayon ako sa mga tuntunin & kundisyon",
+  "label_header_map": "Mapa",
+  "label_text_popover_subtitle": "Sumali sa iba pang mga tao na nagmamapa ng basura!",
+  "label_text_popover_text": "Magsimulang lumikha ng mga trashpoints upang gawing mas malinis at malusog ang iyong komunidad.",
+  "label_header_activity": "Aking mga aktibidad",
+  "label_text_activity_empty_subtitle": "Walang makikita dito!",
+  "label_text_activity_empty_text": "Hindi ka pa nagdaradag ng anumang trashpoints. Kapag nagdagdag ka ng trashpoint, iyon ay mai-lilista dito.",
+  "label_text_activity_empty_hint": "Magdagdag ng isang trashpoint!",
+  "label_header_notific": "Mga notification",
+  "label_text_notific_empty_subtitle": "Walang makikita dito!",
+  "label_text_notific_empty_text": "Hindi pa kami nakakita ng anumang notification, ngunit ipapaalam sa iyo kapag mayroon na!",
+  "label_header_profile": "Aking profile",
+  "label_header_settings": "Mga setting ng account",
+  "label_button_country_empty": "Bansa",
+  "label_text_country": "Bansa",
+  "label_header_select_country": "Pumili ng bansa",
+  "label_text_select_country_hint": "Maghanap",
+  "label_button_tc": "Mga tuntunin at kondisyon",
+  "label_button_logout": "Mag-logout",
+  "label_text_congrats_image": "Nakunang basura",
+  "label_text_congrats_subtitle": "Mahusay!",
+  "label_text_congrats_text": "Ngayon i-save ang lugar sa pamamagitan ng nagpapatunay na mga datos.",
+  "label_header_createTP": "Lumikha ng isang trashpoint",
+  "label_button_createTP_editloc": "Mag-edit ng lokasyon",
+  "label_header_edit_loc": "Mag-edit ng lokasyon",
+  "label_button_edit_loc_set": "Magtakda ng lokasyon ng trashpoint",
+  "label_text_createTP_status_subtitle": "Katayuan ng lugar",
+  "label_text_createTP_status_text": "Kung ang isang mabilis na pagkilos ay kinakailangang (nakakalason, heavy metal), mangyaring itakda bilang banta.",
+  "label_text_createTP_add_photos": "Magdagdag ng mga larawan ng basura",
+  "label_text_createTP_select_amount": "Piliin ang dami ng basura",
+  "label_text_createTP_select_type": "Piliin ang uri ng basura",
+  "label_text_createTP_add_hashtags": "Karagdagang mga tag",
+  "label_text_createTP_add_hashtags_hint": "halimbawa #tatak, #lata",
+  "label_button_createTP_confirm_create": "Lumikha ng isang trashpoint",
+  "label_alert_createTP_success": "Ang trashpoint ay matagumpay na nalikha",
+  "label_text_detailsTP_photos": "Mga larawan ng basura",
+  "label_text_detailsTP_amount": "Dami ng basura",
+  "label_text_detailsTP_type": "Uri ng basura",
+  "label_text_editTP_ask": "Ang impormasyong ito ba tungkol sa trashpoint ay tama at napapanahon?",
+  "label_text_editTP_letsconfirm": "Oo, Kinukumpirma ko",
+  "label_alert_editTP_confirm": "Ang trashpoint matagumpay na nakumpirma",
+  "label_text_editTP_letsedit": "Hindi, tayo'y mag-edit",
+  "label_header_editTP": "I-edit ang trashpoint",
+  "label_button_editTP_save": "I-save ang mga pagbabago sa trashpoint",
+  "label_alert_editTP_edit": "Ang trashpoint ay matagumpay na nai-update",
+  "label_alert_editTP_delete": "Trashpoint matagumpay na nabura",
+  "label_error_editTP_out_of_rng_subtitle": "Hindi sakop ng range",
+  "label_error_editTP_out_of_rng_text": "Ang isang lugar ay maaari lamang i-edit kung ikaw ay nasa loob ng 100 metro nito.",
+  "label_error_saveTP_subtitle": "I-save ang trashpoint",
+  "label_error_saveTP_pic_and_type": "Higit na kapaki-pakinabang para sa amin kung kukuha ng kahit isang larawan ng trashpoint at magtakda ng uri ng basura nito.",
+  "label_error_saveTP_picture": "Higit na kapaki-pakinabang para sa amin kung kukuha ng kahit isang larawan ng trashpoint bago ito i-save.",
+  "label_error_saveTP_trash_type": "Higit na kapaki-pakinabang para sa amin kung itinakda mo ang uri ng mga trashpoint bago ito i-save.",
+  "label_error_change_loc_subtitle": "Nasa labas ng hangganan",
+  "label_error_change_loc_text": "Mangyaring ilagay ang isang lugar sa loob ng 100 metro ng iyong lokasyon.",
+  "label_error_generic_error_subtitle": "Nasa labas ng hangganan",
+  "label_error_generic_error_text": "Nagkaroon ng error sa server.",
+  "label_error_network_subtitle": "Walang koneksyon sa network",
+  "label_error_network_text": "Hindi pinagagana ang mobile data. Paganahin ang mobile data o ikonekta ang iyong telepono sa Wi-Fi para gamitin ang application na ito.",
+  "label_error_location_subtitle": "Paganahin ang lokasyon",
+  "label_error_location_text": "Ang Location Services ay nakapatay. Mangyaring paganahin ang GPS mo sa iyong mga setting upang gamitin ang application na ito.",
+  "label_error_loc_permission_text": "Hindi pinapayagan ang mga serbisyo ng lokasyon. Pakiusap na payagan ang mga ito upang gamitin ang application na ito.",
+  "label_trash_details_header": "Mga detalye ng Trashpoint",
+  "label_privacy_policy_header": "Patakaran sa privacy",
+  "label_about_header": "Tungkol sa",
+  "label_edit_trashpoint_button": "I-edit ang trashpoint",
+  "label_100m_limit_modal": "Ang isang lugar ay maaari lamang i-edit kung ikaw ay nasa loob ng 100 metro nito.",
+  "label_retry_button": "Subukang muli",
+  "label_country_picker_placeholder": "Piliin ang iyong bansa",
+  "label_camera_permission_warning_ios": "Kailangan mong baguhin ang mga permiso sa akses ng kamera. Upang gawin ito, pumunta sa Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "Kailangan mong baguhin ang mga permiso sa akses ng kamera. Upang gawin ito, pumunta sa Settings > Apps",
+  "label_camera_error_title": "Hindi pinayagan ang akses sa camera",
+  "label_error_modal_default_title": "Ah hindi!",
+  "label_error_modal_default_subtitle": "Ang fail whale ay nakapansin ng server error!",
+  "label_location_permission_warning_ios": "Kailangan mong baguhin ang mga pahintulot sa lokasyon. Upang gawin ito, pumunta sa Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "Kailangan mong baguhin ang mga pahintulot sa lokasyon. Upang gawin ito, pumunta sa Settings > Apps.",
+  "label_location_off_warning": "Ang Location Services ay nakapatay. Mangyaring paganahin ang GPS mo sa iyong mga setting upang gamitin ang application na ito.",
+  "label_location_modal_title": "Paganahin ang lokasyon",
+  "label_network_off_warning_title": "Walang koneksyon sa network",
+  "label_network_off_warning": "Hindi pinagagana ang mobile data. Paganahin ang mobile data o ikonekta ang iyong telepono sa Wi-Fi para gamitin ang application na ito.",
+  "label_loading_image_text": "Halos tapos na...",
+  "label_loading_image_subtext": "Mangyaring maghintay habang isina-save natin ang iyong mga aksyon.",
+  "label_create_marker_missing_photos": "Hindi nai-upload ang mga marker na larawan. Pakisubukang idagdag muli ang mga ito.",
+  "label_edit_marker_missing_photos": "Hindi nai-upload ang mga marker na larawan. Pakisubukang idagdag muli ang mga ito.",
+  "label_confirm_marker_missing_photos": "Hindi nai-upload ang mga marker na larawan. Pakisubukang idagdag muli ang mga ito.",
+  "label_button_delete": "Burahin",
+  "label_delete_photo_title": "Burahin ang larawan",
+  "label_delete_photo_subtitle": "Tiyak ka bang gusto mong burahin ang larawan? Hindi mo na maibabalik ito.",
+  "label_text_about_1": "Ang app na ito ay isang inisyatibo ng Let's Do It World",
+  "label_text_about_2": "Ang lahat ng datos na nakolekta mula sa mga gumagamit ng app sa buong mundo ay ipipakita sa mapa ng global na basura para sa pagbago sa pamamagitan ng pandaigdigang paglilinis na magaganap sa ika-15 ng Setyembre taong 2018",
+  "label_text_about_3": "Ang app ay isang magkasanib na pakikipagtulungan sa",
+  "label_text_about_4": "Estonian product, itinataguyod ng bansa at pamahalaan",
+  "label_text_about_5": "Mga Natatag: Ministro ng Kapaligiran ng Estonia, Ministro ng Panglabas na Pikikipagugnayan ng Republika ng Estonia, Programa ng Republika ng Estonia 100",
+  "label_button_editTP_delete": "Burahin ang trashpoint",
+  "label_locked_account_warning": "Naka-lock ang account mo. Para sa mga detalye makipag-ugnayan sa administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/pi.json b/mobile-app/src/trans/pi.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/pi.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/pl.json b/mobile-app/src/trans/pl.json
index 3656db8b61..2d13df57ff 100644
--- a/mobile-app/src/trans/pl.json
+++ b/mobile-app/src/trans/pl.json
@@ -7,15 +7,15 @@
   "label_button_cancel": "Anuluj",
   "label_button_continue": "Kontynuuj",
   "label_trash_status_threat": "zagrożenie",
-  "label_trash_status_regular": "regularne",
+  "label_trash_status_regular": "normalne",
   "label_trash_status_cleaned": "oczyszczone",
   "label_trash_status_outdated": "nieaktualne",
   "label_trash_status_user": "użytkownik",
-  "label_trash_status_change_location": "zmieńLokację",
+  "label_trash_status_change_location": "zmień lokalizację",
   "label_trash_status_state_threat": "Ten punkt stanowi zagrożenie!",
-  "label_trash_status_state_regular": "To jest zwykły trashpoint.",
-  "label_trash_status_state_cleaned": "To miejsce jest oczyszczone!",
-  "label_trash_status_state_outdated": "To miejsce jest przestarzałe!",
+  "label_trash_status_state_regular": "To zaśmiecone miejsce ma status \"normalny\".",
+  "label_trash_status_state_cleaned": "To zaśmiecone miejsce jest oczyszczone!",
+  "label_trash_status_state_outdated": "To miejsce jest nieaktualne!",
   "label_TP_created_date": "Stworzone",
   "label_TP_updated_date": "Zaktualizowane",
   "label_TP_by": " przez ",
@@ -27,23 +27,23 @@
   "label_trash_type_metal": "Metal",
   "label_trash_type_glass": "Szkło",
   "label_trash_type_electro": "Elektronika",
-  "label_trash_type_paper": "Papier/drewno",
+  "label_trash_type_paper": "Papier/Drewno",
   "label_trash_type_tyres": "Opony",
-  "label_trash_type_dom_waste": "Odpady domowe",
+  "label_trash_type_dom_waste": "Odpady komunalne",
   "label_trash_type_furniture": "Meble",
   "label_trash_type_org_waste": "Odpady organiczne",
   "label_header_tc": "Regulamin",
-  "label_button_tc_agree": "Zgadzam się z warunkami regulaminu",
+  "label_button_tc_agree": "Zgadzam się z Regulaminem",
   "label_header_map": "Mapa",
-  "label_text_popover_subtitle": "Dołącz do ludzi, którzy mapują śmieci!",
-  "label_text_popover_text": "Zacznij tworzenie trashpoint'ów, aby zrobić swoją lokalną społeczność czystszą i zdrowszą.",
+  "label_text_popover_subtitle": "Dołącz do innych ludzi, którzy mapują śmieci!",
+  "label_text_popover_text": "Zacznij tworzenie zaśmieconych miejsc i spraw, żeby twoje otoczenie było czystsze i zdrowsze.",
   "label_header_activity": "Moja aktywność",
   "label_text_activity_empty_subtitle": "Nic tu nie ma!",
-  "label_text_activity_empty_text": "Nie dodałeś jeszcze żadnych trashpoint'ów. Kiedy to zrobisz, będą one wypisane tutaj.",
-  "label_text_activity_empty_hint": "Dodaj nowy trashpoint!",
+  "label_text_activity_empty_text": "Nie dodałeś jeszcze żadnych zaśmieconych miejsc. Kiedy to zrobisz, będą one wypisane tutaj.",
+  "label_text_activity_empty_hint": "Dodaj nowe zaśmiecone miejsce!",
   "label_header_notific": "Powiadomienia",
   "label_text_notific_empty_subtitle": "Nic tu nie ma!",
-  "label_text_notific_empty_text": "Nie widzieliśmy żadnych przychodzących powiadomień, ale damy Ci znać, kiedy zobaczymy!",
+  "label_text_notific_empty_text": "Nie widzieliśmy żadnych przychodzących powiadomień, ale damy Ci znać, kiedy je zobaczymy!",
   "label_header_profile": "Mój profil",
   "label_header_settings": "Ustawienia konta",
   "label_button_country_empty": "Kraj",
@@ -52,79 +52,79 @@
   "label_text_select_country_hint": "Szukaj",
   "label_button_tc": "Regulamin",
   "label_button_logout": "Wyloguj",
-  "label_text_congrats_image": "Śmieci złapane",
+  "label_text_congrats_image": "Śmieci schwytane",
   "label_text_congrats_subtitle": "Świetna robota!",
-  "label_text_congrats_text": "Teraz zapisz punkt poprzez weryfikację danych.",
-  "label_header_createTP": "Stwórz trashpoint",
+  "label_text_congrats_text": "Teraz zapisz miejsce poprzez weryfikację danych.",
+  "label_header_createTP": "Stwórz zaśmiecone miejsce",
   "label_button_createTP_editloc": "Edytuj lokalizację",
   "label_header_edit_loc": "Edytuj lokalizację",
-  "label_button_edit_loc_set": "Ustaw lokalizację trashpoint'u",
-  "label_text_createTP_status_subtitle": "Status punktu",
-  "label_text_createTP_status_text": "Jeśli szybka akcja jest potrzebna (toksyczność, metale ciężkie), proszę ustaw to jako zagrożenie.",
+  "label_button_edit_loc_set": "Ustaw lokalizację zaśmieconego miejsca",
+  "label_text_createTP_status_subtitle": "Status miejsca",
+  "label_text_createTP_status_text": "Jeśli potrzebna jest natychmiastowa akcja (toksyczność, metale ciężkie), proszę ustaw status: zagrożenie.",
   "label_text_createTP_add_photos": "Dodaj zdjęcia śmieci",
   "label_text_createTP_select_amount": "Ustaw ilość śmieci",
   "label_text_createTP_select_type": "Ustaw typ śmieci",
   "label_text_createTP_add_hashtags": "Dodatkowe dodane tagi",
-  "label_text_createTP_add_hashtags_hint": "tzn. #nazwamarki, #puszki",
-  "label_button_createTP_confirm_create": "Stwórz trashpoint",
-  "label_alert_createTP_success": "Trashpoint stworzony pomyślnie",
+  "label_text_createTP_add_hashtags_hint": "tzn. #marka, #puszki",
+  "label_button_createTP_confirm_create": "Stwórz zaśmiecone miejsce",
+  "label_alert_createTP_success": "Zaśmiecone miejsce utworzone pomyślnie",
   "label_text_detailsTP_photos": "Zdjęcia śmieci",
   "label_text_detailsTP_amount": "Ilość śmieci",
   "label_text_detailsTP_type": "Typ śmieci",
-  "label_text_editTP_ask": "Czy informacje o tym trashpoincie jest nadal aktualna i odpowiednia?",
-  "label_text_editTP_letsconfirm": "Tak, potwierdzam",
-  "label_alert_editTP_confirm": "Trashpoint potwierdzony pomyślnie",
-  "label_text_editTP_letsedit": "Nie, przeprowadźmy edycję",
-  "label_header_editTP": "Edytuj trashpoint",
-  "label_button_editTP_save": "Zapisz zmiany w trashpoincie",
-  "label_alert_editTP_edit": "Trashpoint zaktualizowany pomyślnie",
-  "label_alert_editTP_delete": "Trashpoint usunięty pomyślnie",
-  "label_error_editTP_out_of_rng_subtitle": "Poza zakresem",
-  "label_error_editTP_out_of_rng_text": "Punkt może być edytowany jedynie jeśli jesteś w odległości 100 metrów od niego.",
-  "label_error_saveTP_subtitle": "Zapisz trashpoint",
-  "label_error_saveTP_pic_and_type": "Jeśli weźmiesz chociaż jedno zdjęcie trashpointu i jeden rodzaj śmieci bardziej nam pomożesz.",
-  "label_error_saveTP_picture": "Jeśli weźmiesz chociaż jedno zdjęcie trashpointu i jeden rodzaj śmieci przed zapisaniem bardziej nam pomożesz.",
-  "label_error_saveTP_trash_type": "Jest to bardziej przydatne dla nas, jeśli ustawisz typ trashpoint przed zapisaniem.",
+  "label_text_editTP_ask": "Czy informacje o tym zaśmieconym miejscu jest nadal odpowiednia i aktualna?",
+  "label_text_editTP_letsconfirm": "Tak, zatwierdzam",
+  "label_alert_editTP_confirm": "Zaśmiecone miejsce zatwierdzono pomyślnie",
+  "label_text_editTP_letsedit": "Nie, edytujmy to",
+  "label_header_editTP": "Edytuj zaśmiecone miejsce",
+  "label_button_editTP_save": "Zapisz zmiany w zaśmieconym miejscu",
+  "label_alert_editTP_edit": "Zaśmiecone miejsce zaktualizowano pomyślnie",
+  "label_alert_editTP_delete": "Zaśmiecone miejsce usunięto pomyślnie",
+  "label_error_editTP_out_of_rng_subtitle": "Poza zasięgiem",
+  "label_error_editTP_out_of_rng_text": "Miejsce może być edytowane jedynie jeśli jesteś w odległości 100 metrów od niego.",
+  "label_error_saveTP_subtitle": "Zapisz zaśmiecone miejsce",
+  "label_error_saveTP_pic_and_type": "Pomożesz nam bardziej jeśli zrobisz przynajmniej jedno zdjęcie zaśmieconego miejsca i ustawisz rodzaj śmieci.",
+  "label_error_saveTP_picture": "Pomożesz nam bardziej jeśli zrobisz przynajmniej jedno zdjęcie zaśmieconego miejsca przed zapisaniem go.",
+  "label_error_saveTP_trash_type": "Pomożesz nam bardziej jeśli ustawisz typ zaśmieconego miejsca przed zapisaniem go.",
   "label_error_change_loc_subtitle": "Poza zakresem",
-  "label_error_change_loc_text": "Proszę postaw punkt w odległości 100 metrów z Twojej lokalizacji.",
+  "label_error_change_loc_text": "Proszę ustaw miejsce w odległości 100 metrów od Twojej lokalizacji.",
   "label_error_generic_error_subtitle": "Poza zakresem",
   "label_error_generic_error_text": "Wystąpił błąd na serwerze.",
   "label_error_network_subtitle": "Brak połączenia z siecią",
-  "label_error_network_text": "Transmisja danych jest wyłączona. Włącz dane mobilne lub połącz telefon do Wifi do korzystania z aplikacji.",
-  "label_error_location_subtitle": "Umożliw lokalizowanie",
+  "label_error_network_text": "Transmisja danych jest wyłączona. Włącz dane mobilne lub podłącz telefon do WiFi w celu korzystania z aplikacji.",
+  "label_error_location_subtitle": "Udostępnij lokalizację",
   "label_error_location_text": "Usługi lokalizacji są wyłączone. Proszę włączyć GPS w ustawieniach aby móc używać aplikacji.",
-  "label_error_loc_permission_text": "Usługi lokalizacji nie są dozwolone. Proszę dać im pozwolenie w celu korzystania z aplikacji.",
-  "label_trash_details_header": "Szczegóły trashpoint'u",
+  "label_error_loc_permission_text": "Usługi lokalizacji nie są dozwolone. Proszę wyrazić zgodę na nie w celu korzystania z aplikacji.",
+  "label_trash_details_header": "Szczegóły zaśmieconego miejsca",
   "label_privacy_policy_header": "Polityka prywatności",
   "label_about_header": "O",
-  "label_edit_trashpoint_button": "Edytuj trashpoint",
-  "label_100m_limit_modal": "Trashpoint może być edytowany tylko, jeśli jesteś w odległości 100 metrów od niego.",
+  "label_edit_trashpoint_button": "Edytuj zaśmiecone miejsce",
+  "label_100m_limit_modal": "Zaśmiecone miejsce może być edytowany tylko jeśli znajdujesz się w odległości 100 metrów od niego.",
   "label_retry_button": "Ponów próbę",
   "label_country_picker_placeholder": "Wybierz swój kraj",
-  "label_camera_permission_warning_ios": "Musisz zmienić uprawnienia dostępu kamery. Aby to zrobić przejdź do Ustawienia > Prywatność > Kamera",
-  "label_camera_permission_warning_android": "Musisz zmienić uprawnienia dostępu kamery. Aby to zrobić przejdź do Ustawienia > Aplikacje",
-  "label_camera_error_title": "Odmowa dostępu do kamery",
+  "label_camera_permission_warning_ios": "Musisz zmienić uprawnienia dostępu aparatu. Aby to zrobić przejdź do Ustawienia > Prywatność > Aparat",
+  "label_camera_permission_warning_android": "Musisz zmienić uprawnienia dostępu aparatu. Aby to zrobić przejdź do Ustawienia > Aplikacje",
+  "label_camera_error_title": "Odmowa dostępu do aparatu",
   "label_error_modal_default_title": "O nie!",
   "label_error_modal_default_subtitle": "Wielbłąd błędu wykrył błąd serwera!",
-  "label_location_permission_warning_ios": "Musisz zmienić uprawnienia lokacji. Aby to zrobić przejdź do Ustawienia > Prywatność > Ustawienia lokalizacji.",
+  "label_location_permission_warning_ios": "Musisz zmienić uprawnienia lokalizacji. Aby to zrobić przejdź do Ustawienia > Prywatność > Usługi lokalizacji.",
   "label_location_permission_warning_android": "Musisz zmienić uprawnienia lokalizacji. Aby to zrobić przejdź do Ustawienia > Aplikacje.",
   "label_location_off_warning": "Usługi lokalizacji są wyłączone. Proszę włączyć GPS w ustawieniach aby móc używać aplikacji.",
-  "label_location_modal_title": "Umożliw lokalizowanie",
+  "label_location_modal_title": "Udostępnij lokalizację",
   "label_network_off_warning_title": "Brak połączenia z siecią",
-  "label_network_off_warning": "Transmisja danych jest wyłączona. Włącz dane mobilne lub połącz telefon do Wifi do korzystania z aplikacji.",
+  "label_network_off_warning": "Transmisja danych jest wyłączona. Włącz dane mobilne lub podłącz telefon do WiFi w celu korzystania z aplikacji.",
   "label_loading_image_text": "Już prawie...",
   "label_loading_image_subtext": "Czekaj, zapisujemy Twoje działania.",
-  "label_create_marker_missing_photos": "Nie można przekazać zdjęcia znacznika. Proszę spróbuj dodać je ponownie.",
-  "label_edit_marker_missing_photos": "Nie można przekazać zdjęcia znacznika. Proszę spróbuj dodać je ponownie.",
-  "label_confirm_marker_missing_photos": "Nie można przekazać zdjęcia znacznika. Proszę spróbuj dodać je ponownie.",
+  "label_create_marker_missing_photos": "Nie można załadować zdjęć znacznika. Proszę spróbuj dodać je ponownie.",
+  "label_edit_marker_missing_photos": "Nie można załadować zdjęć znacznika. Proszę spróbuj dodać je ponownie.",
+  "label_confirm_marker_missing_photos": "Nie można załadować zdjęć znacznika. Proszę spróbuj dodać je ponownie.",
   "label_button_delete": "Usuń",
   "label_delete_photo_title": "Usuń zdjęcie",
-  "label_delete_photo_subtitle": "Czy na pewno chcesz usunąć zdjęcie? Nie możesz tego cofnąć.",
+  "label_delete_photo_subtitle": "Czy na pewno chcesz usunąć to zdjęcie? Nie możesz tego cofnąć.",
   "label_text_about_1": "Ta aplikacja jest inicjatywą Let's Do It World",
-  "label_text_about_2": "Wszystkie dane zebrane przez użytkowników na całym świecie będzie można podejrzeć na globalnej mapie śmieci, żeby inicjować wydarzenia dotyczące sprzątania na całym świecie podczas Światowego Dnia Sprzątania, 15 września 2018",
+  "label_text_about_2": "Wszystkie dane zebrane przez użytkowników na całym świecie będzie można podejrzeć na globalnej mapie śmieci w celu rozpoczęcia ogólnoświatowych wydarzeń porządkowych podczas Światowego Dnia Odśmiecania, 15 września 2018",
   "label_text_about_3": "Aplikacja współtworzona z",
   "label_text_about_4": "Produkt Estoński, sponsorowany przez kraj i rząd",
-  "label_text_about_5": "Fundatorzy: Estońskie Ministerstwo Środowiska, Ministerstwo Spraw Zagranicznych Republiki Estonii, program 100 Republiki Estońskiej",
-  "label_button_editTP_delete": "Usuń trashpoint",
+  "label_text_about_5": "Fundatorzy: Estońskie Ministerstwo Środowiska, Ministerstwo Spraw Zagranicznych Republiki Estonii, program Republiki Estońskiej \"Estonia100\"",
+  "label_button_editTP_delete": "Usuń zaśmiecone miejsce",
   "label_locked_account_warning": "Twoje konto zostało zablokowane. Po szczegóły skontaktuj się z administratorem."
 }
\ No newline at end of file
diff --git a/mobile-app/src/trans/ps.json b/mobile-app/src/trans/ps.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ps.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/pt.json b/mobile-app/src/trans/pt.json
index 6223b7fe25..ff73a3a68d 100644
--- a/mobile-app/src/trans/pt.json
+++ b/mobile-app/src/trans/pt.json
@@ -108,10 +108,10 @@
   "label_error_modal_default_subtitle": "A baleia da falha encontrou um erro do servidor!",
   "label_location_permission_warning_ios": "Deve alterar as permissões de localização. Para fazer isso, dirija-se a Definições > Privacidade > Serviços de localização",
   "label_location_permission_warning_android": "Deve alterar as permissões de localização. Para fazer isso, dirija-se a Definições > Aplicações",
-  "label_location_off_warning": "Serviços de localização estão desligados. Por favor ligue o seu GPS nas sua configurações para usar a aplicação.",
+  "label_location_off_warning": "Serviços de localização estão desligados. Por favor ligue o seu GPS, nas Definições, para poder usar a aplicação.",
   "label_location_modal_title": "Permitir a localização",
   "label_network_off_warning_title": "Sem ligação à internet",
-  "label_network_off_warning": "Dados móveis encontram-se desligados. Ligue os dados móveis ou conecte o seu telefone ao Wi-Fi para usar a aplicação.",
+  "label_network_off_warning": "Dados móveis encontram-se desligados. Ligue os dados móveis ou Wi-Fi para poder usar a aplicação.",
   "label_loading_image_text": "Quase lá...",
   "label_loading_image_subtext": "Por favor espere, enquanto guardamos as suas acções.",
   "label_create_marker_missing_photos": "As fotos do mercador não conseguiram ser carregadas. Por favor tente adicioná-las novamente.",
diff --git a/mobile-app/src/trans/qya.json b/mobile-app/src/trans/qya.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/qya.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/rn.json b/mobile-app/src/trans/rn.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/rn.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ru.json b/mobile-app/src/trans/ru.json
index ecb5e27ed3..69de760cd6 100644
--- a/mobile-app/src/trans/ru.json
+++ b/mobile-app/src/trans/ru.json
@@ -3,7 +3,7 @@
   "label_button_facebook": "Продолжить через Facebook",
   "label_button_google": "Продолжить через Google",
   "label_button_try_app": "Испытайте приложение, не создавая аккаунт",
-  "label_button_acknowledge": "Окей, понятно!",
+  "label_button_acknowledge": "Понятно!",
   "label_button_cancel": "Отмена",
   "label_button_continue": "Продолжить",
   "label_trash_status_threat": "опасность",
@@ -108,15 +108,15 @@
   "label_error_modal_default_subtitle": "Обнаружена ошибка сервера!",
   "label_location_permission_warning_ios": "Необходимо изменить разрешение для определения местоположения. Чтобы сделать это, зайдите в Настройки > Конфиденциальность > Сервис локализации.",
   "label_location_permission_warning_android": "Необходимо изменить разрешения для определения местоположения. Чтобы сделать это, зайдите в Настройки > Приложения.",
-  "label_location_off_warning": "Определение местонахождения отключено. Чтобы использовать приложение, просим включить GPS в ваших настройках.",
-  "label_location_modal_title": "Разрешить определение местонахождения",
-  "label_network_off_warning_title": "Нет соединения с Интернетом",
+  "label_location_off_warning": "Услуга определения местоположения отключена. Чтобы использовать приложение, включите GPS.",
+  "label_location_modal_title": "Разрешить определять местонахождение",
+  "label_network_off_warning_title": "Нет подключения к Интернету",
   "label_network_off_warning": "Мобильные данные отключены. Чтобы использовать приложение, включите мобильные данные или подключите ваше устройство к Wi-Fi.",
   "label_loading_image_text": "Почти готово...",
   "label_loading_image_subtext": "Просим подождать, пока мы сохраняем ваши данные.",
   "label_create_marker_missing_photos": "Фотографии точки не удалось загрузить. Просим добавить их еще раз.",
   "label_edit_marker_missing_photos": "Фотографии точки не удалось загрузить. Просим добавить их еще раз.",
-  "label_confirm_marker_missing_photos": "Фотографии точки не удалось загрузить. Просим попробовать добавить их еще раз.",
+  "label_confirm_marker_missing_photos": "Фотографии точки не удалось загрузить. Просим добавить их еще раз.",
   "label_button_delete": "Удалить",
   "label_delete_photo_title": "Удалить фото",
   "label_delete_photo_subtitle": "Вы уверены, что желаете удалить фотографию? Это действие нельзя отменить.",
diff --git a/mobile-app/src/trans/sa.json b/mobile-app/src/trans/sa.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/sa.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/sah.json b/mobile-app/src/trans/sah.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/sah.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/sat.json b/mobile-app/src/trans/sat.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/sat.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/sc.json b/mobile-app/src/trans/sc.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/sc.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/sd.json b/mobile-app/src/trans/sd.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/sd.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/sg.json b/mobile-app/src/trans/sg.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/sg.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/sl.json b/mobile-app/src/trans/sl.json
index 78344189bc..9b0bac0c90 100644
--- a/mobile-app/src/trans/sl.json
+++ b/mobile-app/src/trans/sl.json
@@ -1,130 +1,130 @@
 {
-  "label_text_app_subtitle": "Let's clean up the world together!",
-  "label_button_facebook": "Continue with Facebook",
-  "label_button_google": "Continue with Google",
-  "label_button_try_app": "Try out the app without account",
-  "label_button_acknowledge": "Ok, got it!",
-  "label_button_cancel": "Cancel",
-  "label_button_continue": "Continue",
-  "label_trash_status_threat": "threat",
-  "label_trash_status_regular": "regular",
-  "label_trash_status_cleaned": "cleaned",
-  "label_trash_status_outdated": "outdated",
-  "label_trash_status_user": "user",
-  "label_trash_status_change_location": "changeLocation",
-  "label_trash_status_state_threat": "This point is a threat!",
-  "label_trash_status_state_regular": "This is a regular trashpoint.",
-  "label_trash_status_state_cleaned": "This point is cleaned!",
-  "label_trash_status_state_outdated": "This point is outdated!",
-  "label_TP_created_date": "Created",
-  "label_TP_updated_date": "Updated",
-  "label_TP_by": " by ",
-  "label_trash_amount_handful": "handful",
-  "label_trash_amount_bagful": "bagful",
-  "label_trash_amount_cartloadl": "cartload",
-  "label_trash_amount_truckload": "truckload",
-  "label_trash_type_plastic": "Plastic",
-  "label_trash_type_metal": "Metal",
-  "label_trash_type_glass": "Glass",
-  "label_trash_type_electro": "Electronics",
-  "label_trash_type_paper": "Paper/Wood",
-  "label_trash_type_tyres": "Tyres",
-  "label_trash_type_dom_waste": "Domestic waste",
-  "label_trash_type_furniture": "Furniture",
-  "label_trash_type_org_waste": "Organic waste",
-  "label_header_tc": "Terms and Conditions",
-  "label_button_tc_agree": "I agree with the Terms & Conditions",
-  "label_header_map": "Map",
-  "label_text_popover_subtitle": "Join other people who are mapping trash!",
-  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
-  "label_header_activity": "My activity",
-  "label_text_activity_empty_subtitle": "Nothing to see here!",
-  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
-  "label_text_activity_empty_hint": "Add a trashpoint!",
-  "label_header_notific": "Notifications",
-  "label_text_notific_empty_subtitle": "Nothing to see here!",
-  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
-  "label_header_profile": "My profile",
-  "label_header_settings": "Account settings",
-  "label_button_country_empty": "Country",
-  "label_text_country": "Country",
-  "label_header_select_country": "Select a country",
-  "label_text_select_country_hint": "Search",
-  "label_button_tc": "Terms and Conditions",
-  "label_button_logout": "Log out",
-  "label_text_congrats_image": "Trash captured",
-  "label_text_congrats_subtitle": "Great job!",
-  "label_text_congrats_text": "Now save the point by verifying the data.",
-  "label_header_createTP": "Create a trashpoint",
-  "label_button_createTP_editloc": "Edit location",
-  "label_header_edit_loc": "Edit location",
-  "label_button_edit_loc_set": "Set trashpoint location",
-  "label_text_createTP_status_subtitle": "Point status",
-  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
-  "label_text_createTP_add_photos": "Add trash photos",
-  "label_text_createTP_select_amount": "Select trash amount",
-  "label_text_createTP_select_type": "Select trash type",
-  "label_text_createTP_add_hashtags": "Additional added tags",
-  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
-  "label_button_createTP_confirm_create": "Create trashpoint",
-  "label_alert_createTP_success": "Trashpoint successfully created",
-  "label_text_detailsTP_photos": "Trash photos",
-  "label_text_detailsTP_amount": "Trash amount",
-  "label_text_detailsTP_type": "Trash type",
-  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
-  "label_text_editTP_letsconfirm": "Yes, I confirm",
-  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
-  "label_text_editTP_letsedit": "No, let's edit",
-  "label_header_editTP": "Edit a trashpoint",
-  "label_button_editTP_save": "Save trashpoint changes",
-  "label_alert_editTP_edit": "Trashpoint successfully updated",
-  "label_alert_editTP_delete": "Trashpoint successfully deleted",
-  "label_error_editTP_out_of_rng_subtitle": "Out of range",
-  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
-  "label_error_saveTP_subtitle": "Save trashpoint",
-  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
-  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
-  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
-  "label_error_change_loc_subtitle": "Out of bounds",
-  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
-  "label_error_generic_error_subtitle": "Out of bounds",
-  "label_error_generic_error_text": "There was an error on the server.",
-  "label_error_network_subtitle": "No network connection",
-  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_error_location_subtitle": "Enable location",
-  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
-  "label_trash_details_header": "Trashpoint details",
-  "label_privacy_policy_header": "Privacy Policy",
-  "label_about_header": "About",
-  "label_edit_trashpoint_button": "Edit trashpoint",
-  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
-  "label_retry_button": "Retry",
-  "label_country_picker_placeholder": "Choose your country",
-  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
-  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
-  "label_camera_error_title": "Camera Access Denied",
-  "label_error_modal_default_title": "Oh noes!",
-  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
-  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
-  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
-  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_location_modal_title": "Enable location",
-  "label_network_off_warning_title": "No network connection",
-  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_loading_image_text": "Almost there...",
-  "label_loading_image_subtext": "Please wait while we save your actions.",
-  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_button_delete": "Delete",
-  "label_delete_photo_title": "Delete photo",
-  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
-  "label_text_about_1": "This app is an initiative by Let's Do It World",
-  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
-  "label_text_about_3": "This app is a joint cooperation with",
-  "label_text_about_4": "Estonian product, sponsored by the country and government",
-  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
-  "label_button_editTP_delete": "Delete trashpoint",
-  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+  "label_text_app_subtitle": "Skupaj očistimo svet!",
+  "label_button_facebook": "Nadaljuj s Facebook računom",
+  "label_button_google": "Nadaljuj z Google računom",
+  "label_button_try_app": "Preizkusi aplikacijo brez računa",
+  "label_button_acknowledge": "Razumem!",
+  "label_button_cancel": "Prekliči",
+  "label_button_continue": "Nadaljuj",
+  "label_trash_status_threat": "nevarno",
+  "label_trash_status_regular": "običajno",
+  "label_trash_status_cleaned": "očiščeno",
+  "label_trash_status_outdated": "zastarelo",
+  "label_trash_status_user": "uporabnik",
+  "label_trash_status_change_location": "spremeni lokacijo",
+  "label_trash_status_state_threat": "Ta točka je nevarna!",
+  "label_trash_status_state_regular": "To je običajno odlagališče.",
+  "label_trash_status_state_cleaned": "Ta točka je očiščena!",
+  "label_trash_status_state_outdated": "Ta točka je zastarela!",
+  "label_TP_created_date": "Najdba",
+  "label_TP_updated_date": "Obisk",
+  "label_TP_by": " : ",
+  "label_trash_amount_handful": "za pest",
+  "label_trash_amount_bagful": "za vrečo",
+  "label_trash_amount_cartloadl": "za voziček",
+  "label_trash_amount_truckload": "za tovornjak",
+  "label_trash_type_plastic": "Plastika",
+  "label_trash_type_metal": "Kovina",
+  "label_trash_type_glass": "Steklo",
+  "label_trash_type_electro": "Elektronika",
+  "label_trash_type_paper": "Papir/Les",
+  "label_trash_type_tyres": "Pnevmatike",
+  "label_trash_type_dom_waste": "Gospodinjski odpadki",
+  "label_trash_type_furniture": "Pohištvo",
+  "label_trash_type_org_waste": "Organski odpadki",
+  "label_header_tc": "Pogoji uporabe",
+  "label_button_tc_agree": "Strinjam se s pogoji uporabe",
+  "label_header_map": "Zemljevid",
+  "label_text_popover_subtitle": "Pridruži se drugim, ki označujejo smeti!",
+  "label_text_popover_text": "Za čistejšo in bolj zdravo skupnost prični vnašati odlagališča.",
+  "label_header_activity": "Moja dejanja",
+  "label_text_activity_empty_subtitle": "Tukaj ni ničesar!",
+  "label_text_activity_empty_text": "Niste vnesli še nobenih odlagališč. Po vnosu bodo navedena tukaj.",
+  "label_text_activity_empty_hint": "Dodaj odlagališče!",
+  "label_header_notific": "Obvestila",
+  "label_text_notific_empty_subtitle": "Tukaj ni ničesar!",
+  "label_text_notific_empty_text": "Zaenkrat še nismo zabeležili nobenih prispelih obvestil!",
+  "label_header_profile": "Moj profil",
+  "label_header_settings": "Nastavitve računa",
+  "label_button_country_empty": "Država",
+  "label_text_country": "Država",
+  "label_header_select_country": "Izberi državo",
+  "label_text_select_country_hint": "Išči",
+  "label_button_tc": "Pogoji uporabe",
+  "label_button_logout": "Odjavi se",
+  "label_text_congrats_image": "Odpadki posneti",
+  "label_text_congrats_subtitle": "Bravo!",
+  "label_text_congrats_text": "S potrditvijo podatkov shranite točko.",
+  "label_header_createTP": "Ustvari odlagališče",
+  "label_button_createTP_editloc": "Uredi lokacijo",
+  "label_header_edit_loc": "Uredi lokacijo",
+  "label_button_edit_loc_set": "Nastavi lokacijo odlagališča",
+  "label_text_createTP_status_subtitle": "Stanje točke",
+  "label_text_createTP_status_text": "Če je potreben hiter odziv (strupenost, težke kovine), prosimo nastavite stanje kot nevarno.",
+  "label_text_createTP_add_photos": "Dodaj slike odpadkov",
+  "label_text_createTP_select_amount": "Izberi količino odpadkov",
+  "label_text_createTP_select_type": "Izberi vrste odpadkov",
+  "label_text_createTP_add_hashtags": "Dodatni zaznamki",
+  "label_text_createTP_add_hashtags_hint": "tj. #imeznamke, #pločevinke",
+  "label_button_createTP_confirm_create": "Ustvari odlagališče",
+  "label_alert_createTP_success": "Odlagališče je bilo uspešno ustvarjeno",
+  "label_text_detailsTP_photos": "Slike odpadkov",
+  "label_text_detailsTP_amount": "Količina odpadkov",
+  "label_text_detailsTP_type": "Vrste odpadkov",
+  "label_text_editTP_ask": "Ali so podatki odlagališča še vedno pravilni in ažurni?",
+  "label_text_editTP_letsconfirm": "Da, potrjujem",
+  "label_alert_editTP_confirm": "Odlagališče je bilo uspešno potrjeno",
+  "label_text_editTP_letsedit": "Ne, uredi",
+  "label_header_editTP": "Uredi odlagališče",
+  "label_button_editTP_save": "Shrani spremembe odlagališča",
+  "label_alert_editTP_edit": "Odlagališče je bilo uspešno posodobljeno",
+  "label_alert_editTP_delete": "Odlagališče je bilo uspešno izbrisano",
+  "label_error_editTP_out_of_rng_subtitle": "Izven dosega",
+  "label_error_editTP_out_of_rng_text": "Točko je možno urediti le, če ste od nje oddaljeni največ 100 m.",
+  "label_error_saveTP_subtitle": "Shrani odlagališče",
+  "label_error_saveTP_pic_and_type": "Obvezno je posneti vsaj eno sliko odlagališča in nastaviti tip odpadkov.",
+  "label_error_saveTP_picture": "Obvezno je posneti vsaj eno sliko odlagališča preden ga shranite.",
+  "label_error_saveTP_trash_type": "Obvezno je nastaviti tip odpadkov preden shranite odlagališče.",
+  "label_error_change_loc_subtitle": "Izven dosega",
+  "label_error_change_loc_text": "Prosimo postavite točko v radiju 100 m od vaše lokacije.",
+  "label_error_generic_error_subtitle": "Izven dosega",
+  "label_error_generic_error_text": "Na strežniku je prišlo do napake.",
+  "label_error_network_subtitle": "Ni internetne povezave",
+  "label_error_network_text": "Mobilni podatki so izključeni. Vključite prenos mobilnih podatkov ali se povežite na Wi-Fi omrežje.",
+  "label_error_location_subtitle": "Omogoči lokacijo",
+  "label_error_location_text": "Lokacijske storitve so izklopljene. Za uporabo aplikacije prosimo, da v nastavitvah vklopite vaš GPS.",
+  "label_error_loc_permission_text": "Dostop do lokacije ni dovoljen. Prosimo, da podate dovoljenje aplikaciji za uporabo lokacijskih storitev.",
+  "label_trash_details_header": "Podrobnosti odlagališča",
+  "label_privacy_policy_header": "Varstvo zasebnosti",
+  "label_about_header": "O WCD",
+  "label_edit_trashpoint_button": "Uredi odlagališče",
+  "label_100m_limit_modal": "Točko lahko urejate le, če ste od nje oddaljeni največ 100 m.",
+  "label_retry_button": "Poskusi znova",
+  "label_country_picker_placeholder": "Izberi svojo državo",
+  "label_camera_permission_warning_ios": "Spremenite dovoljenje za dostop do fotoaparata. Pojdite v Nastavitve > Zasebnost > Fotoaparat",
+  "label_camera_permission_warning_android": "Spremenite dovoljenje za dostop do fotoaparata. Pojdite na Nastavitve > Aplikacije",
+  "label_camera_error_title": "Dostop do kamere je bil zavrnjen",
+  "label_error_modal_default_title": "Zlomka!",
+  "label_error_modal_default_subtitle": "Razočarani kit je zaznal napako na strežniku!",
+  "label_location_permission_warning_ios": "Spremenite dovoljenje za dostop do lokacije. Pojdite v Nastavitve> Zasebnost > Lokacijske storitve.",
+  "label_location_permission_warning_android": "Spremenite dovoljenje za dostop do lokacije. Pojdite v Nastavitve > Aplikacije.",
+  "label_location_off_warning": "Lokacijske storitve so izklopljene. Za uporabo aplikacije prosimo, da v nastavitvah vklopite vaš GPS.",
+  "label_location_modal_title": "Omogoči lokacijo",
+  "label_network_off_warning_title": "Ni internetne povezave",
+  "label_network_off_warning": "Mobilni podatki so izključeni. Vključite prenos mobilnih podatkov ali se povežite na Wi-Fi omrežje.",
+  "label_loading_image_text": "Skoraj tam...",
+  "label_loading_image_subtext": "Shranjujemo vaše podatke, prosimo počakajte.",
+  "label_create_marker_missing_photos": "Slike niso bile naložene. Prosimo poskusite jih ponovno dodati.",
+  "label_edit_marker_missing_photos": "Slike niso bile naložene. Prosimo poskusite jih ponovno dodati.",
+  "label_confirm_marker_missing_photos": "Slike niso bile naložene. Prosimo poskusite jih ponovno dodati.",
+  "label_button_delete": "Izbriši",
+  "label_delete_photo_title": "Izbriši fotografijo",
+  "label_delete_photo_subtitle": "Ste prepričani, da želite izbrisati sliko? Odločitev bo trajna.",
+  "label_text_about_1": "Pobudnik aplikacije je Let's Do It World",
+  "label_text_about_2": "Vsi podatki, ki jih zberejo uporabniki po vsem svetu, bodo prikazani na globalni karti odpadkov za spodbujanje svetovne čistilne akcije Svetovni dan čiščenja 15. septembra 2018",
+  "label_text_about_3": "Ta aplikacije je nastala v sodelovanju z",
+  "label_text_about_4": "Estonski izdelek, sponzoriran iz strani države in vlade",
+  "label_text_about_5": "Financerji: Estonsko ministrstvo za okolje, Ministrstvo za zunanje zadeve Republike Estonije, Program 100 Republike Estonije",
+  "label_button_editTP_delete": "Izbriši odlagališče",
+  "label_locked_account_warning": "Vaš račun je zaklenjen. Za podrobnosti se obrnite na skrbnika."
 }
\ No newline at end of file
diff --git a/mobile-app/src/trans/sn.json b/mobile-app/src/trans/sn.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/sn.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/son.json b/mobile-app/src/trans/son.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/son.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/sq.json b/mobile-app/src/trans/sq.json
index 83509d460e..c5c14d258d 100644
--- a/mobile-app/src/trans/sq.json
+++ b/mobile-app/src/trans/sq.json
@@ -108,7 +108,7 @@
   "label_error_modal_default_subtitle": "U identifikua një problem në server!",
   "label_location_permission_warning_ios": "Duhet të lejoni përcaktimin e vendndodhjes tuaj. Për ta bërë këtë, shkoni tek Settings > Privacy > Location services.",
   "label_location_permission_warning_android": "Duhet të lejoni përcaktimin e vendndodhjes tuaj. Për ta bërë këtë, shkoni tek Settings > Apps.",
-  "label_location_off_warning": "Location Services është e çaktivizuar. Ju lutem aktivizoni GPS-in tek Settings për të përdorur aplikacionin.",
+  "label_location_off_warning": "Location Services janë të çaktivizuara. Ju lutem, aktivizoni GPS-in tek Settings për të përdorur aplikacionin.",
   "label_location_modal_title": "Aktivizo vendndodhjen",
   "label_network_off_warning_title": "Nuk ka lidhje interneti",
   "label_network_off_warning": "Lidhja e internetit në celularin tuaj është e çaktivizuar. Ju lutem, aktivizoni internetin në celularit tuaj ose lidhuni me Wi-Fi për të përdorur aplikacionin.",
diff --git a/mobile-app/src/trans/sr.json b/mobile-app/src/trans/sr.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/sr.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ss.json b/mobile-app/src/trans/ss.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ss.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/su.json b/mobile-app/src/trans/su.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/su.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/sw.json b/mobile-app/src/trans/sw.json
index 78344189bc..68f388279d 100644
--- a/mobile-app/src/trans/sw.json
+++ b/mobile-app/src/trans/sw.json
@@ -1,130 +1,130 @@
 {
-  "label_text_app_subtitle": "Let's clean up the world together!",
-  "label_button_facebook": "Continue with Facebook",
-  "label_button_google": "Continue with Google",
-  "label_button_try_app": "Try out the app without account",
-  "label_button_acknowledge": "Ok, got it!",
-  "label_button_cancel": "Cancel",
-  "label_button_continue": "Continue",
-  "label_trash_status_threat": "threat",
-  "label_trash_status_regular": "regular",
-  "label_trash_status_cleaned": "cleaned",
-  "label_trash_status_outdated": "outdated",
-  "label_trash_status_user": "user",
-  "label_trash_status_change_location": "changeLocation",
-  "label_trash_status_state_threat": "This point is a threat!",
-  "label_trash_status_state_regular": "This is a regular trashpoint.",
-  "label_trash_status_state_cleaned": "This point is cleaned!",
-  "label_trash_status_state_outdated": "This point is outdated!",
-  "label_TP_created_date": "Created",
-  "label_TP_updated_date": "Updated",
-  "label_TP_by": " by ",
-  "label_trash_amount_handful": "handful",
-  "label_trash_amount_bagful": "bagful",
-  "label_trash_amount_cartloadl": "cartload",
-  "label_trash_amount_truckload": "truckload",
-  "label_trash_type_plastic": "Plastic",
-  "label_trash_type_metal": "Metal",
-  "label_trash_type_glass": "Glass",
-  "label_trash_type_electro": "Electronics",
-  "label_trash_type_paper": "Paper/Wood",
-  "label_trash_type_tyres": "Tyres",
-  "label_trash_type_dom_waste": "Domestic waste",
-  "label_trash_type_furniture": "Furniture",
-  "label_trash_type_org_waste": "Organic waste",
-  "label_header_tc": "Terms and Conditions",
-  "label_button_tc_agree": "I agree with the Terms & Conditions",
-  "label_header_map": "Map",
-  "label_text_popover_subtitle": "Join other people who are mapping trash!",
-  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
-  "label_header_activity": "My activity",
-  "label_text_activity_empty_subtitle": "Nothing to see here!",
-  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
-  "label_text_activity_empty_hint": "Add a trashpoint!",
-  "label_header_notific": "Notifications",
-  "label_text_notific_empty_subtitle": "Nothing to see here!",
-  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
-  "label_header_profile": "My profile",
-  "label_header_settings": "Account settings",
-  "label_button_country_empty": "Country",
-  "label_text_country": "Country",
-  "label_header_select_country": "Select a country",
-  "label_text_select_country_hint": "Search",
-  "label_button_tc": "Terms and Conditions",
-  "label_button_logout": "Log out",
-  "label_text_congrats_image": "Trash captured",
-  "label_text_congrats_subtitle": "Great job!",
-  "label_text_congrats_text": "Now save the point by verifying the data.",
-  "label_header_createTP": "Create a trashpoint",
-  "label_button_createTP_editloc": "Edit location",
-  "label_header_edit_loc": "Edit location",
-  "label_button_edit_loc_set": "Set trashpoint location",
-  "label_text_createTP_status_subtitle": "Point status",
-  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
-  "label_text_createTP_add_photos": "Add trash photos",
-  "label_text_createTP_select_amount": "Select trash amount",
-  "label_text_createTP_select_type": "Select trash type",
-  "label_text_createTP_add_hashtags": "Additional added tags",
-  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
-  "label_button_createTP_confirm_create": "Create trashpoint",
-  "label_alert_createTP_success": "Trashpoint successfully created",
-  "label_text_detailsTP_photos": "Trash photos",
-  "label_text_detailsTP_amount": "Trash amount",
-  "label_text_detailsTP_type": "Trash type",
-  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
-  "label_text_editTP_letsconfirm": "Yes, I confirm",
-  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
-  "label_text_editTP_letsedit": "No, let's edit",
-  "label_header_editTP": "Edit a trashpoint",
-  "label_button_editTP_save": "Save trashpoint changes",
-  "label_alert_editTP_edit": "Trashpoint successfully updated",
-  "label_alert_editTP_delete": "Trashpoint successfully deleted",
-  "label_error_editTP_out_of_rng_subtitle": "Out of range",
-  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
-  "label_error_saveTP_subtitle": "Save trashpoint",
-  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
-  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
-  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
-  "label_error_change_loc_subtitle": "Out of bounds",
-  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
-  "label_error_generic_error_subtitle": "Out of bounds",
-  "label_error_generic_error_text": "There was an error on the server.",
-  "label_error_network_subtitle": "No network connection",
-  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_error_location_subtitle": "Enable location",
-  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
-  "label_trash_details_header": "Trashpoint details",
-  "label_privacy_policy_header": "Privacy Policy",
-  "label_about_header": "About",
-  "label_edit_trashpoint_button": "Edit trashpoint",
-  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
-  "label_retry_button": "Retry",
-  "label_country_picker_placeholder": "Choose your country",
-  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
-  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
-  "label_camera_error_title": "Camera Access Denied",
-  "label_error_modal_default_title": "Oh noes!",
-  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
-  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
-  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
-  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
-  "label_location_modal_title": "Enable location",
-  "label_network_off_warning_title": "No network connection",
-  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
-  "label_loading_image_text": "Almost there...",
-  "label_loading_image_subtext": "Please wait while we save your actions.",
-  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
-  "label_button_delete": "Delete",
-  "label_delete_photo_title": "Delete photo",
-  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
-  "label_text_about_1": "This app is an initiative by Let's Do It World",
-  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
-  "label_text_about_3": "This app is a joint cooperation with",
-  "label_text_about_4": "Estonian product, sponsored by the country and government",
-  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
-  "label_button_editTP_delete": "Delete trashpoint",
-  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+  "label_text_app_subtitle": "Tuungane pamoja tusafishe Dunia!",
+  "label_button_facebook": "Endelea na usajili wa Facebook",
+  "label_button_google": "Endelea na usajili wa Google",
+  "label_button_try_app": "Jaribu kufungua programu bila kujisajili",
+  "label_button_acknowledge": "Sawa!",
+  "label_button_cancel": "Futa",
+  "label_button_continue": "Endelea",
+  "label_trash_status_threat": "hatari",
+  "label_trash_status_regular": "kawaida",
+  "label_trash_status_cleaned": "imesafishwa",
+  "label_trash_status_outdated": "muda wa matumizi umeisha",
+  "label_trash_status_user": "mtumiaji",
+  "label_trash_status_change_location": "badili eneo",
+  "label_trash_status_state_threat": "Eneo hili ni hatari!",
+  "label_trash_status_state_regular": "Hili ni eneo lenye taka za kawaida.",
+  "label_trash_status_state_cleaned": "Eneo hili limesafishwa!",
+  "label_trash_status_state_outdated": "Eneo hili muda wake umepita!",
+  "label_TP_created_date": "Imetengenezwa",
+  "label_TP_updated_date": "Imesahihishwa",
+  "label_TP_by": " kwa ",
+  "label_trash_amount_handful": "kiganja",
+  "label_trash_amount_bagful": "mfuko",
+  "label_trash_amount_cartloadl": "mkokoteni",
+  "label_trash_amount_truckload": "lori",
+  "label_trash_type_plastic": "Plastiki",
+  "label_trash_type_metal": "Chuma",
+  "label_trash_type_glass": "Kioo",
+  "label_trash_type_electro": "Vifaa vya elektroniki",
+  "label_trash_type_paper": "Karatasi/Mbao",
+  "label_trash_type_tyres": "Tairi",
+  "label_trash_type_dom_waste": "Taka za majumbani",
+  "label_trash_type_furniture": "Samani",
+  "label_trash_type_org_waste": "Taka ozo",
+  "label_header_tc": "Vigezo na masharti",
+  "label_button_tc_agree": "Nakubaliana na vigezo na masharti",
+  "label_header_map": "Ramani",
+  "label_text_popover_subtitle": "Ungana na watu wanaochora ramani sehemu zenye taka!",
+  "label_text_popover_text": "Anza kuunda maeneo yenye taka, kufanya jamii yako safi na salama.",
+  "label_header_activity": "Historia yangu",
+  "label_text_activity_empty_subtitle": "Hamna kitu!",
+  "label_text_activity_empty_text": "Taarifa zako hazipo. Zikiwekwa, zitaorodheshwa hapa.",
+  "label_text_activity_empty_hint": "Weka eneo lenye taka!",
+  "label_header_notific": "Taarifa",
+  "label_text_notific_empty_subtitle": "Hamna kitu!",
+  "label_text_notific_empty_text": "Bado hatujaona taarifa yeyote. Ikiingia, tutakujulisha!",
+  "label_header_profile": "Taarifa zangu",
+  "label_header_settings": "Mpangilio wa akaunti",
+  "label_button_country_empty": "Nchi",
+  "label_text_country": "Nchi",
+  "label_header_select_country": "Chagua nchi",
+  "label_text_select_country_hint": "Tafuta",
+  "label_button_tc": "Vigezo na masharti",
+  "label_button_logout": "Aga",
+  "label_text_congrats_image": "Taka zimepigwa picha",
+  "label_text_congrats_subtitle": "Kazi nzuri!",
+  "label_text_congrats_text": "Sasa hifadhi eneo lenye taka kwa kuhakikisha taarifa.",
+  "label_header_createTP": "Unda eneo lenye taka",
+  "label_button_createTP_editloc": "Hariri eneo",
+  "label_header_edit_loc": "Hariri eneo",
+  "label_button_edit_loc_set": "Weka eneo lenye taka",
+  "label_text_createTP_status_subtitle": "Hali ya eneo",
+  "label_text_createTP_status_text": "Kama hatua za haraka zinahitajika (sumu, metali nzito), Tafadhali weka alama ya hatari.",
+  "label_text_createTP_add_photos": "Ongeza picha ya takataka",
+  "label_text_createTP_select_amount": "Chagua kiwango cha taka",
+  "label_text_createTP_select_type": "Chagua aina ya taka",
+  "label_text_createTP_add_hashtags": "Ongeza nembo ya ziada",
+  "label_text_createTP_add_hashtags_hint": "mfano. #jinalakampuni, #kopo",
+  "label_button_createTP_confirm_create": "Unda eneo lenye taka",
+  "label_alert_createTP_success": "Eneo lenye taka limefanikiwa kuundwa",
+  "label_text_detailsTP_photos": "Picha ya takataka",
+  "label_text_detailsTP_amount": "Kiasi cha taka",
+  "label_text_detailsTP_type": "Aina ya taka",
+  "label_text_editTP_ask": "Je, taarifa ya eneo lenye taka bado ni sahihi na imesahihishwa?",
+  "label_text_editTP_letsconfirm": "Ndio, Nathibitisha",
+  "label_alert_editTP_confirm": "Eneo lenye taka limefanikiwa kuthibitishwa",
+  "label_text_editTP_letsedit": "Hapana, hebu turekebishe",
+  "label_header_editTP": "Hariri eneo lenye taka",
+  "label_button_editTP_save": "Hifadhi mabadiliko ya eneo lenye taka",
+  "label_alert_editTP_edit": "Eneo lenye taka limefanikiwa kusahihishwa",
+  "label_alert_editTP_delete": "Eneo lenye taka limefanikiwa kufutwa",
+  "label_error_editTP_out_of_rng_subtitle": "Haipatikani",
+  "label_error_editTP_out_of_rng_text": "Unaweza kuhariri eneo lenye taka ukiwa mita 100 toka kwenye eneo hilo.",
+  "label_error_saveTP_subtitle": "Hifadhi eneo lenye taka",
+  "label_error_saveTP_pic_and_type": "Ni muhimu kuweka picha angalau moja ya eneo lenye taka na kuchagua aina ya taka.",
+  "label_error_saveTP_picture": "Ni muhimu kuweka picha angalau moja ya eneo lenye taka na kuchagua aina ya taka.",
+  "label_error_saveTP_trash_type": "Ni muhimu kuweka picha angalau moja ya eneo lenye taka na kuchagua aina ya taka.",
+  "label_error_change_loc_subtitle": "Uko mbali na eneo lenye taka",
+  "label_error_change_loc_text": "Tafadhali weka eneo lenye taka ukiwa ndani ya mita 100 kutoka kwenye eneo hilo.",
+  "label_error_generic_error_subtitle": "Uko mbali na eneo lenye taka",
+  "label_error_generic_error_text": "Kulikuwa na kosa katika mtandao.",
+  "label_error_network_subtitle": "Hakuna mtandao uliounganishwa",
+  "label_error_network_text": "Simu yako haijaunganishwa na intaneti, washa intaneti au unganisha simu yako na Wi-Fi ili utumie programu.",
+  "label_error_location_subtitle": "Ruhusu GPS kwenye simu yako",
+  "label_error_location_text": "Huduma ya GPS imefungwa, Tafadhari washa GPS yako kwenye mipangilio kwa kutumia programu.",
+  "label_error_loc_permission_text": "Huduma za GPS haziruhusiwi. Tafadhali waruhusu ili waweze kutumia programu.",
+  "label_trash_details_header": "Maelezo ya eneo lenye taka",
+  "label_privacy_policy_header": "Masharti binafsi",
+  "label_about_header": "Kuhusu",
+  "label_edit_trashpoint_button": "Hariri eneo lenye taka",
+  "label_100m_limit_modal": "Unaweza kuhariri eneo lenye taka ukiwa mita 100 toka kwenye eneo hilo.",
+  "label_retry_button": "Jaribu tena",
+  "label_country_picker_placeholder": "Chagua nchi yako",
+  "label_camera_permission_warning_ios": "Badili mpangilio wa kamera. Kufanya hivyo, nenda sehemu ya setting >Privacy >camera",
+  "label_camera_permission_warning_android": "Badili mpangilio wa kamera. Kufanya hivyo, nenda sehemu ya setting >Privacy >camera",
+  "label_camera_error_title": "Kamera haipatikani",
+  "label_error_modal_default_title": "Hapana!",
+  "label_error_modal_default_subtitle": "Huduma haipatikani kwa sasa!",
+  "label_location_permission_warning_ios": "Badili mpangilio wa GPS. Kufanya hivyo, nenda sehemu ya setting >Privacy >Location service.",
+  "label_location_permission_warning_android": "Badili mpangilio wa GPS. Kufanya hivyo, nenda sehemu ya setting >Privacy >Location service.",
+  "label_location_off_warning": "Huduma ya GPS imefungwa, Tafadhari washa GPS yako kwenye mipangilio kwa kutumia programu.",
+  "label_location_modal_title": "Ruhusu GPS kwenye simu yako",
+  "label_network_off_warning_title": "Hakuna mtandao uliounganishwa",
+  "label_network_off_warning": "Simu yako haijaunganishwa na intaneti, washa intaneti au unganisha simu yako na Wi-Fi ili utumie programu.",
+  "label_loading_image_text": "Subiri kidogo...",
+  "label_loading_image_subtext": "Tafadhari subiri. Tunathibitisha taarifa zako.",
+  "label_create_marker_missing_photos": "Picha hazijafanikiwa kuwekwa kwenye mtandao, Tafadhari jaribu tena.",
+  "label_edit_marker_missing_photos": "Picha hazijafanikiwa kuwekwa kwenye mtandao, Tafadhari jaribu tena.",
+  "label_confirm_marker_missing_photos": "Picha hazijafanikiwa kuwekwa kwenye mtandao, Tafadhari jaribu tena.",
+  "label_button_delete": "Futa",
+  "label_delete_photo_title": "Futa picha",
+  "label_delete_photo_subtitle": "Una uhakika kwamba unahitaji kufuta hii picha? ikifutika huwezi kuirudisha tena.",
+  "label_text_about_1": "Programu hii ni mpango wa Let's Do It World",
+  "label_text_about_2": "Taarifa zote zitakazo kusanywa na watumiaji duniani kote zitaoneshwa kwenye ramani kubwa ya taka ya dunia, ili kuanzisha harakati za kusafisha dunia kwenye tukio kubwa la kusafisha dunia, tarehe 15 Septemba 2018",
+  "label_text_about_3": "Programu hii ni ushirikiano wa",
+  "label_text_about_4": "Estonia product, umedhaminiwa na nchi na serikali",
+  "label_text_about_5": "Wadhamini: Wizara ya mazingira ya Estonia, Wizara ya mambo ya kigeni ya Jamhuri ya Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Futa eneo lenye taka",
+  "label_locked_account_warning": "Akaunti yako imefungwa. Kwa taarifa zaidi wasiliana na uongozi."
 }
\ No newline at end of file
diff --git a/mobile-app/src/trans/syc.json b/mobile-app/src/trans/syc.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/syc.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ta.json b/mobile-app/src/trans/ta.json
index 78a9468906..68f388279d 100644
--- a/mobile-app/src/trans/ta.json
+++ b/mobile-app/src/trans/ta.json
@@ -108,8 +108,8 @@
   "label_error_modal_default_subtitle": "Huduma haipatikani kwa sasa!",
   "label_location_permission_warning_ios": "Badili mpangilio wa GPS. Kufanya hivyo, nenda sehemu ya setting >Privacy >Location service.",
   "label_location_permission_warning_android": "Badili mpangilio wa GPS. Kufanya hivyo, nenda sehemu ya setting >Privacy >Location service.",
-  "label_location_off_warning": "Huduma ya GPS imefungwa, Tafadhari washa GPS yako kwenye kibadilishio kwa kutumia programu.",
-  "label_location_modal_title": "Washa GPS.",
+  "label_location_off_warning": "Huduma ya GPS imefungwa, Tafadhari washa GPS yako kwenye mipangilio kwa kutumia programu.",
+  "label_location_modal_title": "Ruhusu GPS kwenye simu yako",
   "label_network_off_warning_title": "Hakuna mtandao uliounganishwa",
   "label_network_off_warning": "Simu yako haijaunganishwa na intaneti, washa intaneti au unganisha simu yako na Wi-Fi ili utumie programu.",
   "label_loading_image_text": "Subiri kidogo...",
diff --git a/mobile-app/src/trans/tay.json b/mobile-app/src/trans/tay.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/tay.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ti.json b/mobile-app/src/trans/ti.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ti.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/tl.json b/mobile-app/src/trans/tl.json
index b815b23dc6..6bd9412f7a 100644
--- a/mobile-app/src/trans/tl.json
+++ b/mobile-app/src/trans/tl.json
@@ -108,15 +108,15 @@
   "label_error_modal_default_subtitle": "Nakapansin ng serber error ang fail whale!",
   "label_location_permission_warning_ios": "Kailangan mong baguhin ang mga pahintulot sa lakasyon. Upang magawa ito, pumunta sa Settings >Privacy > Location services.",
   "label_location_permission_warning_android": "Kailangan mong baguhin ang mga pahintulot sa lokasyon. Upang magawa ito, pumunta sa Settings > Apps.",
-  "label_location_off_warning": "Nakapatay ang Location Services. Mangyari lamang na paganahin ang iyong GPS sa iyong Settings upang magamit ang application.",
-  "label_location_modal_title": "Paganahin ang lokasyon",
+  "label_location_off_warning": "Nakapatay ang iyong Location Services. Paganagin ang iyong GPS sa iyong Settings upang magamit ang application.",
+  "label_location_modal_title": "Paganahin ang Location",
   "label_network_off_warning_title": "Walang koneksyon sa network",
-  "label_network_off_warning": "Nakapatay ang mobile data. Paganahin ang mobile data o di kaya'y ikonekta sa Wi-Fi ang iyong telepono upang magamit ang application.",
+  "label_network_off_warning": "Hindi naka-on ang mobile data. I-on ang mobile data o di kaya'y ikonekta sa Wi-Fi ang iyong telepono upang magamit ang application.",
   "label_loading_image_text": "Halos tapos na...",
   "label_loading_image_subtext": "Mangyari lamang maghintay habang sini-save namin ang iyong mga nagawa.",
   "label_create_marker_missing_photos": "Hindi ma-upload ang mga marker photos. Mangyari lamang na subukan itong idadagdag muli.",
-  "label_edit_marker_missing_photos": "Hindi ma-upload ang mga marker photos. Mangyari lamang na subukan itong idagdag muli.",
-  "label_confirm_marker_missing_photos": "Hindi ma-upload ang mga marker photos. Mangyari lamang na subukan itong idagdag muli.",
+  "label_edit_marker_missing_photos": "Hindi ma-upload ang mga marker photos. Mangyari lamang na subukan itong idadagdag muli.",
+  "label_confirm_marker_missing_photos": "Hindi ma-upload ang mga marker photos. Mangyari lamang na subukan itong idadagdag muli.",
   "label_button_delete": "Burahin",
   "label_delete_photo_title": "Burahin ang litrato",
   "label_delete_photo_subtitle": "Sigurado ka bang gusto mong burahin ang litrato. Hindi mo na ito maibabalik.",
diff --git a/mobile-app/src/trans/tlh.json b/mobile-app/src/trans/tlh.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/tlh.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/tr.json b/mobile-app/src/trans/tr.json
index 69524ebc65..2e811db4ed 100644
--- a/mobile-app/src/trans/tr.json
+++ b/mobile-app/src/trans/tr.json
@@ -1,6 +1,6 @@
 {
   "label_text_app_subtitle": "Hadi hep beraber dünyayı temizleyelim!",
-  "label_button_facebook": "Facebook’la",
+  "label_button_facebook": "Facebook’la devam et ",
   "label_button_google": "Google’la devam et",
   "label_button_try_app": "Uygulamayı hesapla giriş yapmadan dene",
   "label_button_acknowledge": "Tamam, anladım!",
@@ -8,15 +8,15 @@
   "label_button_continue": "Devam et",
   "label_trash_status_threat": "tehdit",
   "label_trash_status_regular": "düzenli",
-  "label_trash_status_cleaned": "temiz",
-  "label_trash_status_outdated": "eski",
+  "label_trash_status_cleaned": "temizlenmis",
+  "label_trash_status_outdated": "eskimis",
   "label_trash_status_user": "kullanıcı",
-  "label_trash_status_change_location": "konum değiştir",
+  "label_trash_status_change_location": "konumu değiştir",
   "label_trash_status_state_threat": "Bu nokta bir tehdittir!",
-  "label_trash_status_state_regular": "Birası devamlı bir çöp alanı.",
+  "label_trash_status_state_regular": "Birası devamlı bir çöp alanıdır.",
   "label_trash_status_state_cleaned": "Bu alan temizlendi!",
   "label_trash_status_state_outdated": "Bu nokta güncel değil!",
-  "label_TP_created_date": "Oluşturulan",
+  "label_TP_created_date": "Oluşturulmuş",
   "label_TP_updated_date": "Güncellendi",
   "label_TP_by": " tarafından ",
   "label_trash_amount_handful": "bir avuç",
@@ -36,11 +36,11 @@
   "label_button_tc_agree": "Şartları ve koşulları kabul ediyorum",
   "label_header_map": "Harita",
   "label_text_popover_subtitle": "Çöp haritalayan diğer kişilere katılın!",
-  "label_text_popover_text": "Topluluğunuzu daha temiz ve sağlıklı hale getirmek için çöp puanı oluşturmaya başlayın.",
+  "label_text_popover_text": "Topluluğunuzu daha temiz ve sağlıklı hale getirmek için çöp alanı oluşturmaya başlayın.",
   "label_header_activity": "Benim etkinliğim",
   "label_text_activity_empty_subtitle": "Burada görecek bir şey yok!",
-  "label_text_activity_empty_text": "Henüz herhangi bir çöp puanı eklemediniz. Ne zaman yaparsan, burada listelenecekler.",
-  "label_text_activity_empty_hint": "Çöp kutusu ekleyin!",
+  "label_text_activity_empty_text": "Henüz herhangi bir çöp alanı eklemediniz. Ne zaman yaparsan, burada listelenecekler.",
+  "label_text_activity_empty_hint": "Çöp alanı ekleyin!",
   "label_header_notific": "Bildirimler",
   "label_text_notific_empty_subtitle": "Burada görecek bir şey yok!",
   "label_text_notific_empty_text": "Henüz bir bildirim gelmediğini görüyoruz, ancak ne zaman yaptığımız konusunda sizi bilgilendiririz!",
@@ -50,12 +50,12 @@
   "label_text_country": "Ülke",
   "label_header_select_country": "Bir ülke seçin",
   "label_text_select_country_hint": "Arama",
-  "label_button_tc": "Şartlar ve koşullar",
+  "label_button_tc": "Şartlar be koşullar",
   "label_button_logout": "Çıkış",
   "label_text_congrats_image": "Yakalanan çöp",
   "label_text_congrats_subtitle": "Harika iş!",
   "label_text_congrats_text": "Şimdi verileri doğrulayarak noktayı kaydedin.",
-  "label_header_createTP": "Çöp kutusu yarat",
+  "label_header_createTP": "Çöp noktası yarat",
   "label_button_createTP_editloc": "Konumu Düzenle",
   "label_header_edit_loc": "Konumu Düzenle",
   "label_button_edit_loc_set": "Çöp yeri konumunu ayarla",
diff --git a/mobile-app/src/trans/ts.json b/mobile-app/src/trans/ts.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ts.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/tt.json b/mobile-app/src/trans/tt.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/tt.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/tw.json b/mobile-app/src/trans/tw.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/tw.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/tzl.json b/mobile-app/src/trans/tzl.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/tzl.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/uk.json b/mobile-app/src/trans/uk.json
index 91b9214117..7b37a6f3f2 100644
--- a/mobile-app/src/trans/uk.json
+++ b/mobile-app/src/trans/uk.json
@@ -1,5 +1,5 @@
 {
-  "label_text_app_subtitle": "Зробімо світ чистіше разом!",
+  "label_text_app_subtitle": "Зробимо світ чистим разом!",
   "label_button_facebook": "Увійти через Facebook",
   "label_button_google": "Увійти через Google",
   "label_button_try_app": "Продовжити без аккаунту",
diff --git a/mobile-app/src/trans/uz.json b/mobile-app/src/trans/uz.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/uz.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/val.json b/mobile-app/src/trans/val.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/val.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/ve.json b/mobile-app/src/trans/ve.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/ve.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/vi.json b/mobile-app/src/trans/vi.json
index 37555fd894..b226029662 100644
--- a/mobile-app/src/trans/vi.json
+++ b/mobile-app/src/trans/vi.json
@@ -50,7 +50,7 @@
   "label_text_country": "Quốc gia",
   "label_header_select_country": "Chọn một quốc gia",
   "label_text_select_country_hint": "Tìm kiếm",
-  "label_button_tc": "Điều khoản và Điều kiện",
+  "label_button_tc": "Điều khoản & Điều kiện",
   "label_button_logout": "Đăng xuất",
   "label_text_congrats_image": "Đã thu gom rác",
   "label_text_congrats_subtitle": "Tuyệt vời!",
@@ -115,8 +115,8 @@
   "label_loading_image_text": "Gần như sẵn sàng...",
   "label_loading_image_subtext": "Xin vui lòng chờ trong khi chúng tôi lưu hành động của bạn.",
   "label_create_marker_missing_photos": "Không được tải lên hình ảnh có đánh dấu. Hãy thử thêm một lần nữa.",
-  "label_edit_marker_missing_photos": "Hình ảnh có đánh dấu sẽ không thể tải lên được. Hãy thử thêm một lần nữa.",
-  "label_confirm_marker_missing_photos": "Hình ảnh có đánh dấu sẽ không thể tải lên được. Hãy thử thêm một lần nữa.",
+  "label_edit_marker_missing_photos": "Không được tải lên hình ảnh có đánh dấu. Hãy thử thêm một lần nữa.",
+  "label_confirm_marker_missing_photos": "Không được tải lên hình ảnh có đánh dấu. Hãy thử thêm một lần nữa.",
   "label_button_delete": "Xóa bỏ",
   "label_delete_photo_title": "Xóa ảnh",
   "label_delete_photo_subtitle": "Bạn có chắc chắn muốn xóa hình ảnh không? Bạn không thể hoàn tác việc này.",
diff --git a/mobile-app/src/trans/wa.json b/mobile-app/src/trans/wa.json
new file mode 100644
index 0000000000..78344189bc
--- /dev/null
+++ b/mobile-app/src/trans/wa.json
@@ -0,0 +1,130 @@
+{
+  "label_text_app_subtitle": "Let's clean up the world together!",
+  "label_button_facebook": "Continue with Facebook",
+  "label_button_google": "Continue with Google",
+  "label_button_try_app": "Try out the app without account",
+  "label_button_acknowledge": "Ok, got it!",
+  "label_button_cancel": "Cancel",
+  "label_button_continue": "Continue",
+  "label_trash_status_threat": "threat",
+  "label_trash_status_regular": "regular",
+  "label_trash_status_cleaned": "cleaned",
+  "label_trash_status_outdated": "outdated",
+  "label_trash_status_user": "user",
+  "label_trash_status_change_location": "changeLocation",
+  "label_trash_status_state_threat": "This point is a threat!",
+  "label_trash_status_state_regular": "This is a regular trashpoint.",
+  "label_trash_status_state_cleaned": "This point is cleaned!",
+  "label_trash_status_state_outdated": "This point is outdated!",
+  "label_TP_created_date": "Created",
+  "label_TP_updated_date": "Updated",
+  "label_TP_by": " by ",
+  "label_trash_amount_handful": "handful",
+  "label_trash_amount_bagful": "bagful",
+  "label_trash_amount_cartloadl": "cartload",
+  "label_trash_amount_truckload": "truckload",
+  "label_trash_type_plastic": "Plastic",
+  "label_trash_type_metal": "Metal",
+  "label_trash_type_glass": "Glass",
+  "label_trash_type_electro": "Electronics",
+  "label_trash_type_paper": "Paper/Wood",
+  "label_trash_type_tyres": "Tyres",
+  "label_trash_type_dom_waste": "Domestic waste",
+  "label_trash_type_furniture": "Furniture",
+  "label_trash_type_org_waste": "Organic waste",
+  "label_header_tc": "Terms and Conditions",
+  "label_button_tc_agree": "I agree with the Terms & Conditions",
+  "label_header_map": "Map",
+  "label_text_popover_subtitle": "Join other people who are mapping trash!",
+  "label_text_popover_text": "Start creating trashpoints to make your community cleaner and healthier.",
+  "label_header_activity": "My activity",
+  "label_text_activity_empty_subtitle": "Nothing to see here!",
+  "label_text_activity_empty_text": "You haven't added any trashpoints yet. When you do, they will be listed here.",
+  "label_text_activity_empty_hint": "Add a trashpoint!",
+  "label_header_notific": "Notifications",
+  "label_text_notific_empty_subtitle": "Nothing to see here!",
+  "label_text_notific_empty_text": "We haven't seen any notifications come in yet, but we'll let you know when we do!",
+  "label_header_profile": "My profile",
+  "label_header_settings": "Account settings",
+  "label_button_country_empty": "Country",
+  "label_text_country": "Country",
+  "label_header_select_country": "Select a country",
+  "label_text_select_country_hint": "Search",
+  "label_button_tc": "Terms and Conditions",
+  "label_button_logout": "Log out",
+  "label_text_congrats_image": "Trash captured",
+  "label_text_congrats_subtitle": "Great job!",
+  "label_text_congrats_text": "Now save the point by verifying the data.",
+  "label_header_createTP": "Create a trashpoint",
+  "label_button_createTP_editloc": "Edit location",
+  "label_header_edit_loc": "Edit location",
+  "label_button_edit_loc_set": "Set trashpoint location",
+  "label_text_createTP_status_subtitle": "Point status",
+  "label_text_createTP_status_text": "If a quick action is needed (toxic, heavy metals), please set as threat.",
+  "label_text_createTP_add_photos": "Add trash photos",
+  "label_text_createTP_select_amount": "Select trash amount",
+  "label_text_createTP_select_type": "Select trash type",
+  "label_text_createTP_add_hashtags": "Additional added tags",
+  "label_text_createTP_add_hashtags_hint": "ie. #brandname, #cans",
+  "label_button_createTP_confirm_create": "Create trashpoint",
+  "label_alert_createTP_success": "Trashpoint successfully created",
+  "label_text_detailsTP_photos": "Trash photos",
+  "label_text_detailsTP_amount": "Trash amount",
+  "label_text_detailsTP_type": "Trash type",
+  "label_text_editTP_ask": "Is this trashpoint information still correct and up to date?",
+  "label_text_editTP_letsconfirm": "Yes, I confirm",
+  "label_alert_editTP_confirm": "Trashpoint successfully confirmed",
+  "label_text_editTP_letsedit": "No, let's edit",
+  "label_header_editTP": "Edit a trashpoint",
+  "label_button_editTP_save": "Save trashpoint changes",
+  "label_alert_editTP_edit": "Trashpoint successfully updated",
+  "label_alert_editTP_delete": "Trashpoint successfully deleted",
+  "label_error_editTP_out_of_rng_subtitle": "Out of range",
+  "label_error_editTP_out_of_rng_text": "A point can only be edx`ited if you are within 100 meters of it.",
+  "label_error_saveTP_subtitle": "Save trashpoint",
+  "label_error_saveTP_pic_and_type": "It's more useful for us if you to take at least one picture of the trashpoint and set its trash type.",
+  "label_error_saveTP_picture": "It's more useful for us if you to take at least one picture of the trashpoint before saving.",
+  "label_error_saveTP_trash_type": "It's more useful for us if you set the trashpoint's type before saving.",
+  "label_error_change_loc_subtitle": "Out of bounds",
+  "label_error_change_loc_text": "Please place a point within 100 meters of your location.",
+  "label_error_generic_error_subtitle": "Out of bounds",
+  "label_error_generic_error_text": "There was an error on the server.",
+  "label_error_network_subtitle": "No network connection",
+  "label_error_network_text": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_error_location_subtitle": "Enable location",
+  "label_error_location_text": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_error_loc_permission_text": "Location Services are not permitted. Please allow them in order to use the application.",
+  "label_trash_details_header": "Trashpoint details",
+  "label_privacy_policy_header": "Privacy Policy",
+  "label_about_header": "About",
+  "label_edit_trashpoint_button": "Edit trashpoint",
+  "label_100m_limit_modal": "A point can only be edited if you are within 100 meters of it.",
+  "label_retry_button": "Retry",
+  "label_country_picker_placeholder": "Choose your country",
+  "label_camera_permission_warning_ios": "You must change camera access permissions. To do this, go to Settings > Privacy > Camera",
+  "label_camera_permission_warning_android": "You must change camera access permissions. To do this, go to Settings > Apps",
+  "label_camera_error_title": "Camera Access Denied",
+  "label_error_modal_default_title": "Oh noes!",
+  "label_error_modal_default_subtitle": "The fail whale detected a server error!",
+  "label_location_permission_warning_ios": "You must change location permissions. To do this, go to Settings > Privacy > Location services.",
+  "label_location_permission_warning_android": "You must change location permissions. To do this, go to Settings > Apps.",
+  "label_location_off_warning": "Location Services are turned off. Please enable your GPS in your Settings to use the application.",
+  "label_location_modal_title": "Enable location",
+  "label_network_off_warning_title": "No network connection",
+  "label_network_off_warning": "Mobile data is disabled. Enable mobile data or connect your phone to Wi-Fi to use the application.",
+  "label_loading_image_text": "Almost there...",
+  "label_loading_image_subtext": "Please wait while we save your actions.",
+  "label_create_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_edit_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_confirm_marker_missing_photos": "The marker photos could not be uploaded. Please try adding them again.",
+  "label_button_delete": "Delete",
+  "label_delete_photo_title": "Delete photo",
+  "label_delete_photo_subtitle": "Are you sure you want to delete the photo? You cannot undo this.",
+  "label_text_about_1": "This app is an initiative by Let's Do It World",
+  "label_text_about_2": "All the data collected by users worldwide will be visualised in the global trash map for initiating worldwide clean-up events on World Cleanup Day, 15 September 2018",
+  "label_text_about_3": "This app is a joint cooperation with",
+  "label_text_about_4": "Estonian product, sponsored by the country and government",
+  "label_text_about_5": "Funders: Estonian Ministry of Environment, The Ministry of Foreign Affairs of the Republic of Estonia, Estonian Republic 100 program",
+  "label_button_editTP_delete": "Delete trashpoint",
+  "label_locked_account_warning": "Your account is locked. For details contact an administrator."
+}
\ No newline at end of file
diff --git a/mobile-app/src/trans/zh.json b/mobile-app/src/trans/zh.json
index b6cdde2e8e..e9c110b84d 100644
--- a/mobile-app/src/trans/zh.json
+++ b/mobile-app/src/trans/zh.json
@@ -111,7 +111,7 @@
   "label_location_off_warning": "位置服務已關閉。請在您的設置中啟用 GPS 以使用該應用程式。",
   "label_location_modal_title": "啟用位置",
   "label_network_off_warning_title": "無網路連接",
-  "label_network_off_warning": "移動資料被禁用。請啟用移動資料或將手機連接到 wi-fi 以使用該應用程式。",
+  "label_network_off_warning": "移動資料被禁用。啟用移動資料或將手機連接到 wi-fi 以使用該應用程式。",
   "label_loading_image_text": "很快完成...",
   "label_loading_image_subtext": "請稍候, 我們保存您的操作。",
   "label_create_marker_missing_photos": "無法上載標記的照片。請重試",
diff --git a/module-lucius/yarn.lock b/module-lucius/yarn.lock
index 4dbafa33d0..fb57ccd13a 100644
--- a/module-lucius/yarn.lock
+++ b/module-lucius/yarn.lock
@@ -2,45 +2,3 @@
 # yarn lockfile v1
 
 
-async@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
-
-colors@1.0.x:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-
-cycle@1.0.x:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
-
-eyes@0.1.x:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
-
-isstream@0.1.x:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
-moment@^2.18.1:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
-
-stack-trace@0.0.x:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
-
-uuid@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-
-winston@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-2.3.1.tgz#0b48420d978c01804cf0230b648861598225a119"
-  dependencies:
-    async "~1.0.0"
-    colors "1.0.x"
-    cycle "1.0.x"
-    eyes "0.1.x"
-    isstream "0.1.x"
-    stack-trace "0.0.x"
diff --git a/web-app/.env.development b/web-app/.env.development
index dc0aabfd0b..78a89b2e61 100644
--- a/web-app/.env.development
+++ b/web-app/.env.development
@@ -1 +1,2 @@
-API_URL=http://localhost:50000/api/v1
\ No newline at end of file
+API_URL=http://localhost:50000/api/v1
+#REACT_APP_LOCAL_API=http://localhost:50000/api/v1
diff --git a/web-app/README.md b/web-app/README.md
index a04686c9ce..9e9cf9553e 100644
--- a/web-app/README.md
+++ b/web-app/README.md
@@ -1,1901 +1,34 @@
-This project was bootstrapped with [Create React App](https://github.com/facebookincubator/create-react-app).
+# Basics
 
-Below you will find some information on how to perform common tasks.<br>
-You can find the most recent version of this guide [here](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md).
-
-## Table of Contents
-
-- [Updating to New Releases](#updating-to-new-releases)
-- [Sending Feedback](#sending-feedback)
-- [Folder Structure](#folder-structure)
-- [Available Scripts](#available-scripts)
-  - [npm start](#npm-start)
-  - [npm test](#npm-test)
-  - [npm run build](#npm-run-build)
-  - [npm run eject](#npm-run-eject)
-- [Supported Language Features and Polyfills](#supported-language-features-and-polyfills)
-- [Syntax Highlighting in the Editor](#syntax-highlighting-in-the-editor)
-- [Displaying Lint Output in the Editor](#displaying-lint-output-in-the-editor)
-- [Debugging in the Editor](#debugging-in-the-editor)
-- [Changing the Page `<title>`](#changing-the-page-title)
-- [Installing a Dependency](#installing-a-dependency)
-- [Importing a Component](#importing-a-component)
-- [Code Splitting](#code-splitting)
-- [Adding a Stylesheet](#adding-a-stylesheet)
-- [Post-Processing CSS](#post-processing-css)
-- [Adding a CSS Preprocessor (Sass, Less etc.)](#adding-a-css-preprocessor-sass-less-etc)
-- [Adding Images, Fonts, and Files](#adding-images-fonts-and-files)
-- [Using the `public` Folder](#using-the-public-folder)
-  - [Changing the HTML](#changing-the-html)
-  - [Adding Assets Outside of the Module System](#adding-assets-outside-of-the-module-system)
-  - [When to Use the `public` Folder](#when-to-use-the-public-folder)
-- [Using Global Variables](#using-global-variables)
-- [Adding Bootstrap](#adding-bootstrap)
-  - [Using a Custom Theme](#using-a-custom-theme)
-- [Adding Flow](#adding-flow)
-- [Adding Custom Environment Variables](#adding-custom-environment-variables)
-  - [Referencing Environment Variables in the HTML](#referencing-environment-variables-in-the-html)
-  - [Adding Temporary Environment Variables In Your Shell](#adding-temporary-environment-variables-in-your-shell)
-  - [Adding Development Environment Variables In `.env`](#adding-development-environment-variables-in-env)
-- [Can I Use Decorators?](#can-i-use-decorators)
-- [Integrating with an API Backend](#integrating-with-an-api-backend)
-  - [Node](#node)
-  - [Ruby on Rails](#ruby-on-rails)
-- [Proxying API Requests in Development](#proxying-api-requests-in-development)
-  - ["Invalid Host Header" Errors After Configuring Proxy](#invalid-host-header-errors-after-configuring-proxy)
-  - [Configuring the Proxy Manually](#configuring-the-proxy-manually)
-- [Using HTTPS in Development](#using-https-in-development)
-- [Generating Dynamic `<meta>` Tags on the Server](#generating-dynamic-meta-tags-on-the-server)
-- [Pre-Rendering into Static HTML Files](#pre-rendering-into-static-html-files)
-- [Injecting Data from the Server into the Page](#injecting-data-from-the-server-into-the-page)
-- [Running Tests](#running-tests)
-  - [Filename Conventions](#filename-conventions)
-  - [Command Line Interface](#command-line-interface)
-  - [Version Control Integration](#version-control-integration)
-  - [Writing Tests](#writing-tests)
-  - [Testing Components](#testing-components)
-  - [Using Third Party Assertion Libraries](#using-third-party-assertion-libraries)
-  - [Initializing Test Environment](#initializing-test-environment)
-  - [Focusing and Excluding Tests](#focusing-and-excluding-tests)
-  - [Coverage Reporting](#coverage-reporting)
-  - [Continuous Integration](#continuous-integration)
-  - [Disabling jsdom](#disabling-jsdom)
-  - [Snapshot Testing](#snapshot-testing)
-  - [Editor Integration](#editor-integration)
-- [Making a Progressive Web App](#making-a-progressive-web-app)
-  - [Offline-First Considerations](#offline-first-considerations)
-  - [Progressive Web App Metadata](#progressive-web-app-metadata)
-- [Deployment](#deployment)
-  - [Static Server](#static-server)
-  - [Other Solutions](#other-solutions)
-  - [Serving Apps with Client-Side Routing](#serving-apps-with-client-side-routing)
-  - [Building for Relative Paths](#building-for-relative-paths)
-  - [Azure](#azure)
-  - [Firebase](#firebase)
-  - [GitHub Pages](#github-pages)
-  - [Heroku](#heroku)
-  - [Modulus](#modulus)
-  - [Netlify](#netlify)
-  - [Now](#now)
-  - [S3 and CloudFront](#s3-and-cloudfront)
-  - [Surge](#surge)
-- [Advanced Configuration](#advanced-configuration)
-- [Troubleshooting](#troubleshooting)
-  - [`npm start` doesn’t detect changes](#npm-start-doesnt-detect-changes)
-  - [`npm test` hangs on macOS Sierra](#npm-test-hangs-on-macos-sierra)
-  - [`npm run build` silently fails](#npm-run-build-silently-fails)
-  - [`npm run build` fails on Heroku](#npm-run-build-fails-on-heroku)
-  - [Moment.js locales are missing](#momentjs-locales-are-missing)
-- [Something Missing?](#something-missing)
-
-## Updating to New Releases
-
-Create React App is divided into two packages:
-
-* `create-react-app` is a global command-line utility that you use to create new projects.
-* `react-scripts` is a development dependency in the generated projects (including this one).
-
-You almost never need to update `create-react-app` itself: it delegates all the setup to `react-scripts`.
-
-When you run `create-react-app`, it always creates the project with the latest version of `react-scripts` so you’ll get all the new features and improvements in newly created apps automatically.
-
-To update an existing project to a new version of `react-scripts`, [open the changelog](https://github.com/facebookincubator/create-react-app/blob/master/CHANGELOG.md), find the version you’re currently on (check `package.json` in this folder if you’re not sure), and apply the migration instructions for the newer versions.
-
-In most cases bumping the `react-scripts` version in `package.json` and running `npm install` in this folder should be enough, but it’s good to consult the [changelog](https://github.com/facebookincubator/create-react-app/blob/master/CHANGELOG.md) for potential breaking changes.
-
-We commit to keeping the breaking changes minimal so you can upgrade `react-scripts` painlessly.
-
-## Sending Feedback
-
-We are always open to [your feedback](https://github.com/facebookincubator/create-react-app/issues).
-
-## Folder Structure
-
-After creation, your project should look like this:
-
-```
-my-app/
-  README.md
-  node_modules/
-  package.json
-  public/
-    index.html
-    favicon.ico
-  src/
-    App.css
-    App.js
-    App.test.js
-    index.css
-    index.js
-    logo.svg
-```
-
-For the project to build, **these files must exist with exact filenames**:
-
-* `public/index.html` is the page template;
-* `src/index.js` is the JavaScript entry point.
-
-You can delete or rename the other files.
-
-You may create subdirectories inside `src`. For faster rebuilds, only files inside `src` are processed by Webpack.<br>
-You need to **put any JS and CSS files inside `src`**, or Webpack won’t see them.
-
-Only files inside `public` can be used from `public/index.html`.<br>
-Read instructions below for using assets from JavaScript and HTML.
-
-You can, however, create more top-level directories.<br>
-They will not be included in the production build so you can use them for things like documentation.
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.<br>
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.<br>
-You will also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.<br>
-See the section about [running tests](#running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.<br>
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br>
-Your app is ready to be deployed!
-
-See the section about [deployment](#deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Supported Language Features and Polyfills
-
-This project supports a superset of the latest JavaScript standard.<br>
-In addition to [ES6](https://github.com/lukehoban/es6features) syntax features, it also supports:
-
-* [Exponentiation Operator](https://github.com/rwaldron/exponentiation-operator) (ES2016).
-* [Async/await](https://github.com/tc39/ecmascript-asyncawait) (ES2017).
-* [Object Rest/Spread Properties](https://github.com/sebmarkbage/ecmascript-rest-spread) (stage 3 proposal).
-* [Dynamic import()](https://github.com/tc39/proposal-dynamic-import) (stage 3 proposal)
-* [Class Fields and Static Properties](https://github.com/tc39/proposal-class-public-fields) (stage 2 proposal).
-* [JSX](https://facebook.github.io/react/docs/introducing-jsx.html) and [Flow](https://flowtype.org/) syntax.
-
-Learn more about [different proposal stages](https://babeljs.io/docs/plugins/#presets-stage-x-experimental-presets-).
-
-While we recommend to use experimental proposals with some caution, Facebook heavily uses these features in the product code, so we intend to provide [codemods](https://medium.com/@cpojer/effective-javascript-codemods-5a6686bb46fb) if any of these proposals change in the future.
-
-Note that **the project only includes a few ES6 [polyfills](https://en.wikipedia.org/wiki/Polyfill)**:
-
-* [`Object.assign()`](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Object/assign) via [`object-assign`](https://github.com/sindresorhus/object-assign).
-* [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) via [`promise`](https://github.com/then/promise).
-* [`fetch()`](https://developer.mozilla.org/en/docs/Web/API/Fetch_API) via [`whatwg-fetch`](https://github.com/github/fetch).
-
-If you use any other ES6+ features that need **runtime support** (such as `Array.from()` or `Symbol`), make sure you are including the appropriate polyfills manually, or that the browsers you are targeting already support them.
-
-## Syntax Highlighting in the Editor
-
-To configure the syntax highlighting in your favorite text editor, head to the [relevant Babel documentation page](https://babeljs.io/docs/editors) and follow the instructions. Some of the most popular editors are covered.
-
-## Displaying Lint Output in the Editor
-
->Note: this feature is available with `react-scripts@0.2.0` and higher.<br>
->It also only works with npm 3 or higher.
-
-Some editors, including Sublime Text, Atom, and Visual Studio Code, provide plugins for ESLint.
-
-They are not required for linting. You should see the linter output right in your terminal as well as the browser console. However, if you prefer the lint results to appear right in your editor, there are some extra steps you can do.
-
-You would need to install an ESLint plugin for your editor first. Then, add a file called `.eslintrc` to the project root:
-
-```js
-{
-  "extends": "react-app"
-}
-```
-
-Now your editor should report the linting warnings.
-
-Note that even if you edit your `.eslintrc` file further, these changes will **only affect the editor integration**. They won’t affect the terminal and in-browser lint output. This is because Create React App intentionally provides a minimal set of rules that find common mistakes.
-
-If you want to enforce a coding style for your project, consider using [Prettier](https://github.com/jlongster/prettier) instead of ESLint style rules.
-
-## Debugging in the Editor
-
-**This feature is currently only supported by [Visual Studio Code](https://code.visualstudio.com) editor.**
-
-Visual Studio Code supports debugging out of the box with Create React App. This enables you as a developer to write and debug your React code without leaving the editor, and most importantly it enables you to have a continuous development workflow, where context switching is minimal, as you don’t have to switch between tools.
-
-You would need to have the latest version of [VS Code](https://code.visualstudio.com) and VS Code [Chrome Debugger Extension](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome) installed.
-
-Then add the block below to your `launch.json` file and put it inside the `.vscode` folder in your app’s root directory.
-
-```json
-{
-  "version": "0.2.0",
-  "configurations": [{
-    "name": "Chrome",
-    "type": "chrome",
-    "request": "launch",
-    "url": "http://localhost:3000",
-    "webRoot": "${workspaceRoot}/src",
-    "userDataDir": "${workspaceRoot}/.vscode/chrome",
-    "sourceMapPathOverrides": {
-      "webpack:///src/*": "${webRoot}/*"
-    }
-  }]
-}
-```
-
-Start your app by running `npm start`, and start debugging in VS Code by pressing `F5` or by clicking the green debug icon. You can now write code, set breakpoints, make changes to the code, and debug your newly modified code—all from your editor.
-
-## Changing the Page `<title>`
-
-You can find the source HTML file in the `public` folder of the generated project. You may edit the `<title>` tag in it to change the title from “React App” to anything else.
-
-Note that normally you wouldn’t edit files in the `public` folder very often. For example, [adding a stylesheet](#adding-a-stylesheet) is done without touching the HTML.
-
-If you need to dynamically update the page title based on the content, you can use the browser [`document.title`](https://developer.mozilla.org/en-US/docs/Web/API/Document/title) API. For more complex scenarios when you want to change the title from React components, you can use [React Helmet](https://github.com/nfl/react-helmet), a third party library.
-
-If you use a custom server for your app in production and want to modify the title before it gets sent to the browser, you can follow advice in [this section](#generating-dynamic-meta-tags-on-the-server). Alternatively, you can pre-build each page as a static HTML file which then loads the JavaScript bundle, which is covered [here](#pre-rendering-into-static-html-files).
-
-## Installing a Dependency
-
-The generated project includes React and ReactDOM as dependencies. It also includes a set of scripts used by Create React App as a development dependency. You may install other dependencies (for example, React Router) with `npm`:
-
-```
-npm install --save <library-name>
-```
-
-## Importing a Component
-
-This project setup supports ES6 modules thanks to Babel.<br>
-While you can still use `require()` and `module.exports`, we encourage you to use [`import` and `export`](http://exploringjs.com/es6/ch_modules.html) instead.
-
-For example:
-
-### `Button.js`
-
-```js
-import React, { Component } from 'react';
-
-class Button extends Component {
-  render() {
-    // ...
-  }
-}
-
-export default Button; // Don’t forget to use export default!
-```
-
-### `DangerButton.js`
-
-
-```js
-import React, { Component } from 'react';
-import Button from './Button'; // Import a component from another file
-
-class DangerButton extends Component {
-  render() {
-    return <Button color="red" />;
-  }
-}
-
-export default DangerButton;
-```
-
-Be aware of the [difference between default and named exports](http://stackoverflow.com/questions/36795819/react-native-es-6-when-should-i-use-curly-braces-for-import/36796281#36796281). It is a common source of mistakes.
-
-We suggest that you stick to using default imports and exports when a module only exports a single thing (for example, a component). That’s what you get when you use `export default Button` and `import Button from './Button'`.
-
-Named exports are useful for utility modules that export several functions. A module may have at most one default export and as many named exports as you like.
-
-Learn more about ES6 modules:
-
-* [When to use the curly braces?](http://stackoverflow.com/questions/36795819/react-native-es-6-when-should-i-use-curly-braces-for-import/36796281#36796281)
-* [Exploring ES6: Modules](http://exploringjs.com/es6/ch_modules.html)
-* [Understanding ES6: Modules](https://leanpub.com/understandinges6/read#leanpub-auto-encapsulating-code-with-modules)
-
-## Code Splitting
-
-Instead of downloading the entire app before users can use it, code splitting allows you to split your code into small chunks which you can then load on demand.
-
-This project setup supports code splitting via [dynamic `import()`](http://2ality.com/2017/01/import-operator.html#loading-code-on-demand). Its [proposal](https://github.com/tc39/proposal-dynamic-import) is in stage 3. The `import()` function-like form takes the module name as an argument and returns a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) which always resolves to the namespace object of the module.
-
-Here is an example:
-
-### `moduleA.js`
-
-```js
-const moduleA = 'Hello';
-
-export { moduleA };
-```
-### `App.js`
-
-```js
-import React, { Component } from 'react';
-
-class App extends Component {
-  handleClick = () => {
-    import('./moduleA')
-      .then(({ moduleA }) => {
-        // Use moduleA
-      })
-      .catch(err => {
-        // Handle failure
-      });
-  };
-
-  render() {
-    return (
-      <div>
-        <button onClick={this.handleClick}>Load</button>
-      </div>
-    );
-  }
-}
-
-export default App;
-```
-
-This will make `moduleA.js` and all its unique dependencies as a separate chunk that only loads after the user clicks the 'Load' button.
-
-You can also use it with `async` / `await` syntax if you prefer it.
-
-## Adding a Stylesheet
-
-This project setup uses [Webpack](https://webpack.js.org/) for handling all assets. Webpack offers a custom way of “extending” the concept of `import` beyond JavaScript. To express that a JavaScript file depends on a CSS file, you need to **import the CSS from the JavaScript file**:
-
-### `Button.css`
-
-```css
-.Button {
-  padding: 20px;
-}
-```
-
-### `Button.js`
-
-```js
-import React, { Component } from 'react';
-import './Button.css'; // Tell Webpack that Button.js uses these styles
-
-class Button extends Component {
-  render() {
-    // You can use them as regular CSS styles
-    return <div className="Button" />;
-  }
-}
-```
-
-**This is not required for React** but many people find this feature convenient. You can read about the benefits of this approach [here](https://medium.com/seek-ui-engineering/block-element-modifying-your-javascript-components-d7f99fcab52b). However you should be aware that this makes your code less portable to other build tools and environments than Webpack.
-
-In development, expressing dependencies this way allows your styles to be reloaded on the fly as you edit them. In production, all CSS files will be concatenated into a single minified `.css` file in the build output.
-
-If you are concerned about using Webpack-specific semantics, you can put all your CSS right into `src/index.css`. It would still be imported from `src/index.js`, but you could always remove that import if you later migrate to a different build tool.
-
-## Post-Processing CSS
-
-This project setup minifies your CSS and adds vendor prefixes to it automatically through [Autoprefixer](https://github.com/postcss/autoprefixer) so you don’t need to worry about it.
-
-For example, this:
-
-```css
-.App {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-```
-
-becomes this:
-
-```css
-.App {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-orient: horizontal;
-  -webkit-box-direction: normal;
-      -ms-flex-direction: row;
-          flex-direction: row;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-}
-```
-
-If you need to disable autoprefixing for some reason, [follow this section](https://github.com/postcss/autoprefixer#disabling).
-
-## Adding a CSS Preprocessor (Sass, Less etc.)
-
-Generally, we recommend that you don’t reuse the same CSS classes across different components. For example, instead of using a `.Button` CSS class in `<AcceptButton>` and `<RejectButton>` components, we recommend creating a `<Button>` component with its own `.Button` styles, that both `<AcceptButton>` and `<RejectButton>` can render (but [not inherit](https://facebook.github.io/react/docs/composition-vs-inheritance.html)).
-
-Following this rule often makes CSS preprocessors less useful, as features like mixins and nesting are replaced by component composition. You can, however, integrate a CSS preprocessor if you find it valuable. In this walkthrough, we will be using Sass, but you can also use Less, or another alternative.
-
-First, let’s install the command-line interface for Sass:
-
-```
-npm install node-sass-chokidar --save-dev
-```
-Then in `package.json`, add the following lines to `scripts`:
-
-```diff
-   "scripts": {
-+    "build-css": "node-sass-chokidar src/ -o src/",
-+    "watch-css": "npm run build-css && node-sass-chokidar src/ -o src/ --watch --recursive",
-     "start": "react-scripts start",
-     "build": "react-scripts build",
-     "test": "react-scripts test --env=jsdom",
-```
-
->Note: To use a different preprocessor, replace `build-css` and `watch-css` commands according to your preprocessor’s documentation.
-
-Now you can rename `src/App.css` to `src/App.scss` and run `npm run watch-css`. The watcher will find every Sass file in `src` subdirectories, and create a corresponding CSS file next to it, in our case overwriting `src/App.css`. Since `src/App.js` still imports `src/App.css`, the styles become a part of your application. You can now edit `src/App.scss`, and `src/App.css` will be regenerated.
-
-To share variables between Sass files, you can use Sass imports. For example, `src/App.scss` and other component style files could include `@import "./shared.scss";` with variable definitions.
-
-To enable importing files without using relative paths, you can add the  `--include-path` option to the command in `package.json`.
-
-```
-"build-css": "node-sass-chokidar --include-path ./src --include-path ./node_modules src/ -o src/",
-"watch-css": "npm run build-css && node-sass-chokidar --include-path ./src --include-path ./node_modules src/ -o src/ --watch --recursive",
-```
-
-This will allow you to do imports like
-
-```scss
-@import 'styles/_colors.scss'; // assuming a styles directory under src/
-@import 'nprogress/nprogress'; // importing a css file from the nprogress node module
-```
-
-At this point you might want to remove all CSS files from the source control, and add `src/**/*.css` to your `.gitignore` file. It is generally a good practice to keep the build products outside of the source control.
-
-As a final step, you may find it convenient to run `watch-css` automatically with `npm start`, and run `build-css` as a part of `npm run build`. You can use the `&&` operator to execute two scripts sequentially. However, there is no cross-platform way to run two scripts in parallel, so we will install a package for this:
-
-```
-npm install --save-dev npm-run-all
-```
-
-Then we can change `start` and `build` scripts to include the CSS preprocessor commands:
-
-```diff
-   "scripts": {
-     "build-css": "node-sass-chokidar src/ -o src/",
-     "watch-css": "npm run build-css && node-sass-chokidar src/ -o src/ --watch --recursive",
--    "start": "react-scripts start",
--    "build": "react-scripts build",
-+    "start-js": "react-scripts start",
-+    "start": "npm-run-all -p watch-css start-js",
-+    "build": "npm run build-css && react-scripts build",
-     "test": "react-scripts test --env=jsdom",
-     "eject": "react-scripts eject"
-   }
-```
-
-Now running `npm start` and `npm run build` also builds Sass files.
-
-**Why `node-sass-chokidar`?**
-
-`node-sass` has been reported as having the following issues:
-
-- `node-sass --watch` has been reported to have *performance issues* in certain conditions when used in a virtual machine or with docker.
-
-- Infinite styles compiling [#1939](https://github.com/facebookincubator/create-react-app/issues/1939)
-
-- `node-sass` has been reported as having issues with detecting new files in a directory [#1891](https://github.com/sass/node-sass/issues/1891)
-
- `node-sass-chokidar` is used here as it addresses these issues.
-
-## Adding Images, Fonts, and Files
-
-With Webpack, using static assets like images and fonts works similarly to CSS.
-
-You can **`import` a file right in a JavaScript module**. This tells Webpack to include that file in the bundle. Unlike CSS imports, importing a file gives you a string value. This value is the final path you can reference in your code, e.g. as the `src` attribute of an image or the `href` of a link to a PDF.
-
-To reduce the number of requests to the server, importing images that are less than 10,000 bytes returns a [data URI](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs) instead of a path. This applies to the following file extensions: bmp, gif, jpg, jpeg, and png. SVG files are excluded due to [#1153](https://github.com/facebookincubator/create-react-app/issues/1153).
-
-Here is an example:
-
-```js
-import React from 'react';
-import logo from './logo.png'; // Tell Webpack this JS file uses this image
-
-console.log(logo); // /logo.84287d09.png
-
-function Header() {
-  // Import result is the URL of your image
-  return <img src={logo} alt="Logo" />;
-}
-
-export default Header;
-```
-
-This ensures that when the project is built, Webpack will correctly move the images into the build folder, and provide us with correct paths.
-
-This works in CSS too:
-
-```css
-.Logo {
-  background-image: url(./logo.png);
-}
-```
-
-Webpack finds all relative module references in CSS (they start with `./`) and replaces them with the final paths from the compiled bundle. If you make a typo or accidentally delete an important file, you will see a compilation error, just like when you import a non-existent JavaScript module. The final filenames in the compiled bundle are generated by Webpack from content hashes. If the file content changes in the future, Webpack will give it a different name in production so you don’t need to worry about long-term caching of assets.
-
-Please be advised that this is also a custom feature of Webpack.
-
-**It is not required for React** but many people enjoy it (and React Native uses a similar mechanism for images).<br>
-An alternative way of handling static assets is described in the next section.
-
-## Using the `public` Folder
-
->Note: this feature is available with `react-scripts@0.5.0` and higher.
-
-### Changing the HTML
-
-The `public` folder contains the HTML file so you can tweak it, for example, to [set the page title](#changing-the-page-title).
-The `<script>` tag with the compiled code will be added to it automatically during the build process.
-
-### Adding Assets Outside of the Module System
-
-You can also add other assets to the `public` folder.
-
-Note that we normally encourage you to `import` assets in JavaScript files instead.
-For example, see the sections on [adding a stylesheet](#adding-a-stylesheet) and [adding images and fonts](#adding-images-fonts-and-files).
-This mechanism provides a number of benefits:
-
-* Scripts and stylesheets get minified and bundled together to avoid extra network requests.
-* Missing files cause compilation errors instead of 404 errors for your users.
-* Result filenames include content hashes so you don’t need to worry about browsers caching their old versions.
-
-However there is an **escape hatch** that you can use to add an asset outside of the module system.
-
-If you put a file into the `public` folder, it will **not** be processed by Webpack. Instead it will be copied into the build folder untouched.   To reference assets in the `public` folder, you need to use a special variable called `PUBLIC_URL`.
-
-Inside `index.html`, you can use it like this:
-
-```html
-<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
-```
-
-Only files inside the `public` folder will be accessible by `%PUBLIC_URL%` prefix. If you need to use a file from `src` or `node_modules`, you’ll have to copy it there to explicitly specify your intention to make this file a part of the build.
-
-When you run `npm run build`, Create React App will substitute `%PUBLIC_URL%` with a correct absolute path so your project works even if you use client-side routing or host it at a non-root URL.
-
-In JavaScript code, you can use `process.env.PUBLIC_URL` for similar purposes:
-
-```js
-render() {
-  // Note: this is an escape hatch and should be used sparingly!
-  // Normally we recommend using `import` for getting asset URLs
-  // as described in “Adding Images and Fonts” above this section.
-  return <img src={process.env.PUBLIC_URL + '/img/logo.png'} />;
-}
-```
-
-Keep in mind the downsides of this approach:
-
-* None of the files in `public` folder get post-processed or minified.
-* Missing files will not be called at compilation time, and will cause 404 errors for your users.
-* Result filenames won’t include content hashes so you’ll need to add query arguments or rename them every time they change.
-
-### When to Use the `public` Folder
-
-Normally we recommend importing [stylesheets](#adding-a-stylesheet), [images, and fonts](#adding-images-fonts-and-files) from JavaScript.
-The `public` folder is useful as a workaround for a number of less common cases:
-
-* You need a file with a specific name in the build output, such as [`manifest.webmanifest`](https://developer.mozilla.org/en-US/docs/Web/Manifest).
-* You have thousands of images and need to dynamically reference their paths.
-* You want to include a small script like [`pace.js`](http://github.hubspot.com/pace/docs/welcome/) outside of the bundled code.
-* Some library may be incompatible with Webpack and you have no other option but to include it as a `<script>` tag.
-
-Note that if you add a `<script>` that declares global variables, you also need to read the next section on using them.
-
-## Using Global Variables
-
-When you include a script in the HTML file that defines global variables and try to use one of these variables in the code, the linter will complain because it cannot see the definition of the variable.
-
-You can avoid this by reading the global variable explicitly from the `window` object, for example:
-
-```js
-const $ = window.$;
-```
-
-This makes it obvious you are using a global variable intentionally rather than because of a typo.
-
-Alternatively, you can force the linter to ignore any line by adding `// eslint-disable-line` after it.
-
-## Adding Bootstrap
-
-You don’t have to use [React Bootstrap](https://react-bootstrap.github.io) together with React but it is a popular library for integrating Bootstrap with React apps. If you need it, you can integrate it with Create React App by following these steps:
-
-Install React Bootstrap and Bootstrap from npm. React Bootstrap does not include Bootstrap CSS so this needs to be installed as well:
-
-```
-npm install react-bootstrap --save
-npm install bootstrap@3 --save
-```
-
-Import Bootstrap CSS and optionally Bootstrap theme CSS in the beginning of your ```src/index.js``` file:
-
-```js
-import 'bootstrap/dist/css/bootstrap.css';
-import 'bootstrap/dist/css/bootstrap-theme.css';
-// Put any other imports below so that CSS from your
-// components takes precedence over default styles.
-```
-
-Import required React Bootstrap components within ```src/App.js``` file or your custom component files:
-
-```js
-import { Navbar, Jumbotron, Button } from 'react-bootstrap';
-```
-
-Now you are ready to use the imported React Bootstrap components within your component hierarchy defined in the render method. Here is an example [`App.js`](https://gist.githubusercontent.com/gaearon/85d8c067f6af1e56277c82d19fd4da7b/raw/6158dd991b67284e9fc8d70b9d973efe87659d72/App.js) redone using React Bootstrap.
-
-### Using a Custom Theme
-
-Sometimes you might need to tweak the visual styles of Bootstrap (or equivalent package).<br>
-We suggest the following approach:
-
-* Create a new package that depends on the package you wish to customize, e.g. Bootstrap.
-* Add the necessary build steps to tweak the theme, and publish your package on npm.
-* Install your own theme npm package as a dependency of your app.
-
-Here is an example of adding a [customized Bootstrap](https://medium.com/@tacomanator/customizing-create-react-app-aa9ffb88165) that follows these steps.
-
-## Adding Flow
-
-Flow is a static type checker that helps you write code with fewer bugs. Check out this [introduction to using static types in JavaScript](https://medium.com/@preethikasireddy/why-use-static-types-in-javascript-part-1-8382da1e0adb) if you are new to this concept.
-
-Recent versions of [Flow](http://flowtype.org/) work with Create React App projects out of the box.
-
-To add Flow to a Create React App project, follow these steps:
-
-1. Run `npm install --save-dev flow-bin` (or `yarn add --dev flow-bin`).
-2. Add `"flow": "flow"` to the `scripts` section of your `package.json`.
-3. Run `npm run flow -- init` (or `yarn flow -- init`) to create a [`.flowconfig` file](https://flowtype.org/docs/advanced-configuration.html) in the root directory.
-4. Add `// @flow` to any files you want to type check (for example, to `src/App.js`).
-
-Now you can run `npm run flow` (or `yarn flow`) to check the files for type errors.
-You can optionally use an IDE like [Nuclide](https://nuclide.io/docs/languages/flow/) for a better integrated experience.
-In the future we plan to integrate it into Create React App even more closely.
-
-To learn more about Flow, check out [its documentation](https://flowtype.org/).
-
-## Adding Custom Environment Variables
-
->Note: this feature is available with `react-scripts@0.2.3` and higher.
-
-Your project can consume variables declared in your environment as if they were declared locally in your JS files. By
-default you will have `NODE_ENV` defined for you, and any other environment variables starting with
-`REACT_APP_`.
-
-**The environment variables are embedded during the build time**. Since Create React App produces a static HTML/CSS/JS bundle, it can’t possibly read them at runtime. To read them at runtime, you would need to load HTML into memory on the server and replace placeholders in runtime, just like [described here](#injecting-data-from-the-server-into-the-page). Alternatively you can rebuild the app on the server anytime you change them.
-
->Note: You must create custom environment variables beginning with `REACT_APP_`. Any other variables except `NODE_ENV` will be ignored to avoid accidentally [exposing a private key on the machine that could have the same name](https://github.com/facebookincubator/create-react-app/issues/865#issuecomment-252199527). Changing any environment variables will require you to restart the development server if it is running.
-
-These environment variables will be defined for you on `process.env`. For example, having an environment
-variable named `REACT_APP_SECRET_CODE` will be exposed in your JS as `process.env.REACT_APP_SECRET_CODE`.
-
-There is also a special built-in environment variable called `NODE_ENV`. You can read it from `process.env.NODE_ENV`. When you run `npm start`, it is always equal to `'development'`, when you run `npm test` it is always equal to `'test'`, and when you run `npm run build` to make a production bundle, it is always equal to `'production'`. **You cannot override `NODE_ENV` manually.** This prevents developers from accidentally deploying a slow development build to production.
-
-These environment variables can be useful for displaying information conditionally based on where the project is
-deployed or consuming sensitive data that lives outside of version control.
-
-First, you need to have environment variables defined. For example, let’s say you wanted to consume a secret defined
-in the environment inside a `<form>`:
-
-```jsx
-render() {
-  return (
-    <div>
-      <small>You are running this application in <b>{process.env.NODE_ENV}</b> mode.</small>
-      <form>
-        <input type="hidden" defaultValue={process.env.REACT_APP_SECRET_CODE} />
-      </form>
-    </div>
-  );
-}
-```
-
-During the build, `process.env.REACT_APP_SECRET_CODE` will be replaced with the current value of the `REACT_APP_SECRET_CODE` environment variable. Remember that the `NODE_ENV` variable will be set for you automatically.
-
-When you load the app in the browser and inspect the `<input>`, you will see its value set to `abcdef`, and the bold text will show the environment provided when using `npm start`:
-
-```html
-<div>
-  <small>You are running this application in <b>development</b> mode.</small>
-  <form>
-    <input type="hidden" value="abcdef" />
-  </form>
-</div>
-```
-
-The above form is looking for a variable called `REACT_APP_SECRET_CODE` from the environment. In order to consume this
-value, we need to have it defined in the environment. This can be done using two ways: either in your shell or in
-a `.env` file. Both of these ways are described in the next few sections.
-
-Having access to the `NODE_ENV` is also useful for performing actions conditionally:
-
-```js
-if (process.env.NODE_ENV !== 'production') {
-  analytics.disable();
-}
-```
-
-When you compile the app with `npm run build`, the minification step will strip out this condition, and the resulting bundle will be smaller.
-
-### Referencing Environment Variables in the HTML
-
->Note: this feature is available with `react-scripts@0.9.0` and higher.
-
-You can also access the environment variables starting with `REACT_APP_` in the `public/index.html`. For example:
-
-```html
-<title>%REACT_APP_WEBSITE_NAME%</title>
-```
-
-Note that the caveats from the above section apply:
-
-* Apart from a few built-in variables (`NODE_ENV` and `PUBLIC_URL`), variable names must start with `REACT_APP_` to work.
-* The environment variables are injected at build time. If you need to inject them at runtime, [follow this approach instead](#generating-dynamic-meta-tags-on-the-server).
-
-### Adding Temporary Environment Variables In Your Shell
-
-Defining environment variables can vary between OSes. It’s also important to know that this manner is temporary for the
-life of the shell session.
-
-#### Windows (cmd.exe)
-
-```cmd
-set REACT_APP_SECRET_CODE=abcdef&&npm start
-```
-
-(Note: the lack of whitespace is intentional.)
-
-#### Linux, macOS (Bash)
-
-```bash
-REACT_APP_SECRET_CODE=abcdef npm start
-```
-
-### Adding Development Environment Variables In `.env`
-
->Note: this feature is available with `react-scripts@0.5.0` and higher.
-
-To define permanent environment variables, create a file called `.env` in the root of your project:
-
-```
-REACT_APP_SECRET_CODE=abcdef
-```
-
-`.env` files **should be** checked into source control (with the exclusion of `.env*.local`).
-
-#### What other `.env` files are can be used?
-
->Note: this feature is **available with `react-scripts@1.0.0` and higher**.
-
-* `.env`: Default.
-* `.env.local`: Local overrides. **This file is loaded for all environments except test.**
-* `.env.development`, `.env.test`, `.env.production`: Environment-specific settings.
-* `.env.development.local`, `.env.test.local`, `.env.production.local`: Local overrides of environment-specific settings.
-
-Files on the left have more priority than files on the right:
-
-* `npm start`: `.env.development.local`, `.env.development`, `.env.local`, `.env`
-* `npm run build`: `.env.production.local`, `.env.production`, `.env.local`, `.env`
-* `npm test`: `.env.test.local`, `.env.test`, `.env` (note `.env.local` is missing)
-
-These variables will act as the defaults if the machine does not explicitly set them.<br>
-Please refer to the [dotenv documentation](https://github.com/motdotla/dotenv) for more details.
-
->Note: If you are defining environment variables for development, your CI and/or hosting platform will most likely need
-these defined as well. Consult their documentation how to do this. For example, see the documentation for [Travis CI](https://docs.travis-ci.com/user/environment-variables/) or [Heroku](https://devcenter.heroku.com/articles/config-vars).
-
-## Can I Use Decorators?
-
-Many popular libraries use [decorators](https://medium.com/google-developers/exploring-es7-decorators-76ecb65fb841) in their documentation.<br>
-Create React App doesn’t support decorator syntax at the moment because:
-
-* It is an experimental proposal and is subject to change.
-* The current specification version is not officially supported by Babel.
-* If the specification changes, we won’t be able to write a codemod because we don’t use them internally at Facebook.
-
-However in many cases you can rewrite decorator-based code without decorators just as fine.<br>
-Please refer to these two threads for reference:
-
-* [#214](https://github.com/facebookincubator/create-react-app/issues/214)
-* [#411](https://github.com/facebookincubator/create-react-app/issues/411)
-
-Create React App will add decorator support when the specification advances to a stable stage.
-
-## Integrating with an API Backend
-
-These tutorials will help you to integrate your app with an API backend running on another port,
-using `fetch()` to access it.
-
-### Node
-Check out [this tutorial](https://www.fullstackreact.com/articles/using-create-react-app-with-a-server/).
-You can find the companion GitHub repository [here](https://github.com/fullstackreact/food-lookup-demo).
-
-### Ruby on Rails
-
-Check out [this tutorial](https://www.fullstackreact.com/articles/how-to-get-create-react-app-to-work-with-your-rails-api/).
-You can find the companion GitHub repository [here](https://github.com/fullstackreact/food-lookup-demo-rails).
-
-## Proxying API Requests in Development
-
->Note: this feature is available with `react-scripts@0.2.3` and higher.
-
-People often serve the front-end React app from the same host and port as their backend implementation.<br>
-For example, a production setup might look like this after the app is deployed:
-
-```
-/             - static server returns index.html with React app
-/todos        - static server returns index.html with React app
-/api/todos    - server handles any /api/* requests using the backend implementation
-```
-
-Such setup is **not** required. However, if you **do** have a setup like this, it is convenient to write requests like `fetch('/api/todos')` without worrying about redirecting them to another host or port during development.
-
-To tell the development server to proxy any unknown requests to your API server in development, add a `proxy` field to your `package.json`, for example:
-
-```js
-  "proxy": "http://localhost:4000",
-```
-
-This way, when you `fetch('/api/todos')` in development, the development server will recognize that it’s not a static asset, and will proxy your request to `http://localhost:4000/api/todos` as a fallback. The development server will only attempt to send requests without a `text/html` accept header to the proxy.
-
-Conveniently, this avoids [CORS issues](http://stackoverflow.com/questions/21854516/understanding-ajax-cors-and-security-considerations) and error messages like this in development:
-
-```
-Fetch API cannot load http://localhost:4000/api/todos. No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://localhost:3000' is therefore not allowed access. If an opaque response serves your needs, set the request's mode to 'no-cors' to fetch the resource with CORS disabled.
-```
-
-Keep in mind that `proxy` only has effect in development (with `npm start`), and it is up to you to ensure that URLs like `/api/todos` point to the right thing in production. You don’t have to use the `/api` prefix. Any unrecognized request without a `text/html` accept header will be redirected to the specified `proxy`.
-
-The `proxy` option supports HTTP, HTTPS and WebSocket connections.<br>
-If the `proxy` option is **not** flexible enough for you, alternatively you can:
-
-* [Configure the proxy yourself](#configuring-the-proxy-manually)
-* Enable CORS on your server ([here’s how to do it for Express](http://enable-cors.org/server_expressjs.html)).
-* Use [environment variables](#adding-custom-environment-variables) to inject the right server host and port into your app.
-
-### "Invalid Host Header" Errors After Configuring Proxy
-
-When you enable the `proxy` option, you opt into a more strict set of host checks. This is necessary because leaving the backend open to remote hosts makes your computer vulnerable to DNS rebinding attacks. The issue is explained in [this article](https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a) and [this issue](https://github.com/webpack/webpack-dev-server/issues/887).
-
-This shouldn’t affect you when developing on `localhost`, but if you develop remotely like [described here](https://github.com/facebookincubator/create-react-app/issues/2271), you will see this error in the browser after enabling the `proxy` option:
-
->Invalid Host header
-
-To work around it, you can specify your public development host in a file called `.env.development` in the root of your project:
-
-```
-HOST=mypublicdevhost.com
-```
-
-If you restart the development server now and load the app from the specified host, it should work.
-
-If you are still having issues or if you’re using a more exotic environment like a cloud editor, you can bypass the host check completely by adding a line to `.env.development.local`. **Note that this is dangerous and exposes your machine to remote code execution from malicious websites:**
-
-```
-# NOTE: THIS IS DANGEROUS!
-# It exposes your machine to attacks from the websites you visit.
-DANGEROUSLY_DISABLE_HOST_CHECK=true
-```
-
-We don’t recommend this approach.
-
-### Configuring the Proxy Manually
-
->Note: this feature is available with `react-scripts@1.0.0` and higher.
-
-If the `proxy` option is **not** flexible enough for you, you can specify an object in the following form (in `package.json`).<br>
-You may also specify any configuration value [`http-proxy-middleware`](https://github.com/chimurai/http-proxy-middleware#options) or [`http-proxy`](https://github.com/nodejitsu/node-http-proxy#options) supports.
-```js
-{
-  // ...
-  "proxy": {
-    "/api": {
-      "target": "<url>",
-      "ws": true
-      // ...
-    }
-  }
-  // ...
-}
-```
-
-All requests matching this path will be proxies, no exceptions. This includes requests for `text/html`, which the standard `proxy` option does not proxy.
-
-If you need to specify multiple proxies, you may do so by specifying additional entries.
-You may also narrow down matches using `*` and/or `**`, to match the path exactly or any subpath.
-```js
-{
-  // ...
-  "proxy": {
-    // Matches any request starting with /api
-    "/api": {
-      "target": "<url_1>",
-      "ws": true
-      // ...
-    },
-    // Matches any request starting with /foo
-    "/foo": {
-      "target": "<url_2>",
-      "ssl": true,
-      "pathRewrite": {
-        "^/foo": "/foo/beta"
-      }
-      // ...
-    },
-    // Matches /bar/abc.html but not /bar/sub/def.html
-    "/bar/*.html": {
-      "target": "<url_3>",
-      // ...
-    },
-    // Matches /bar/abc.html and /bar/sub/def.html
-    "/baz/**/*.html": {
-      "target": "<url_4>"
-      // ...
-    }
-  }
-  // ...
-}
-```
-
-## Using HTTPS in Development
-
->Note: this feature is available with `react-scripts@0.4.0` and higher.
-
-You may require the dev server to serve pages over HTTPS. One particular case where this could be useful is when using [the "proxy" feature](#proxying-api-requests-in-development) to proxy requests to an API server when that API server is itself serving HTTPS.
-
-To do this, set the `HTTPS` environment variable to `true`, then start the dev server as usual with `npm start`:
-
-#### Windows (cmd.exe)
-
-```cmd
-set HTTPS=true&&npm start
-```
-
-(Note: the lack of whitespace is intentional.)
-
-#### Linux, macOS (Bash)
-
-```bash
-HTTPS=true npm start
-```
-
-Note that the server will use a self-signed certificate, so your web browser will almost definitely display a warning upon accessing the page.
-
-## Generating Dynamic `<meta>` Tags on the Server
-
-Since Create React App doesn’t support server rendering, you might be wondering how to make `<meta>` tags dynamic and reflect the current URL. To solve this, we recommend to add placeholders into the HTML, like this:
-
-```html
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta property="og:title" content="__OG_TITLE__">
-    <meta property="og:description" content="__OG_DESCRIPTION__">
-```
-
-Then, on the server, regardless of the backend you use, you can read `index.html` into memory and replace `__OG_TITLE__`, `__OG_DESCRIPTION__`, and any other placeholders with values depending on the current URL. Just make sure to sanitize and escape the interpolated values so that they are safe to embed into HTML!
-
-If you use a Node server, you can even share the route matching logic between the client and the server. However duplicating it also works fine in simple cases.
-
-## Pre-Rendering into Static HTML Files
-
-If you’re hosting your `build` with a static hosting provider you can use [react-snapshot](https://www.npmjs.com/package/react-snapshot) to generate HTML pages for each route, or relative link, in your application. These pages will then seamlessly become active, or “hydrated”, when the JavaScript bundle has loaded.
-
-There are also opportunities to use this outside of static hosting, to take the pressure off the server when generating and caching routes.
-
-The primary benefit of pre-rendering is that you get the core content of each page _with_ the HTML payload—regardless of whether or not your JavaScript bundle successfully downloads. It also increases the likelihood that each route of your application will be picked up by search engines.
-
-You can read more about [zero-configuration pre-rendering (also called snapshotting) here](https://medium.com/superhighfives/an-almost-static-stack-6df0a2791319).
-
-## Injecting Data from the Server into the Page
-
-Similarly to the previous section, you can leave some placeholders in the HTML that inject global variables, for example:
-
-```js
-<!doctype html>
-<html lang="en">
-  <head>
-    <script>
-      window.SERVER_DATA = __SERVER_DATA__;
-    </script>
-```
-
-Then, on the server, you can replace `__SERVER_DATA__` with a JSON of real data right before sending the response. The client code can then read `window.SERVER_DATA` to use it. **Make sure to [sanitize the JSON before sending it to the client](https://medium.com/node-security/the-most-common-xss-vulnerability-in-react-js-applications-2bdffbcc1fa0) as it makes your app vulnerable to XSS attacks.**
-
-## Running Tests
-
->Note: this feature is available with `react-scripts@0.3.0` and higher.<br>
->[Read the migration guide to learn how to enable it in older projects!](https://github.com/facebookincubator/create-react-app/blob/master/CHANGELOG.md#migrating-from-023-to-030)
-
-Create React App uses [Jest](https://facebook.github.io/jest/) as its test runner. To prepare for this integration, we did a [major revamp](https://facebook.github.io/jest/blog/2016/09/01/jest-15.html) of Jest so if you heard bad things about it years ago, give it another try.
-
-Jest is a Node-based runner. This means that the tests always run in a Node environment and not in a real browser. This lets us enable fast iteration speed and prevent flakiness.
-
-While Jest provides browser globals such as `window` thanks to [jsdom](https://github.com/tmpvar/jsdom), they are only approximations of the real browser behavior. Jest is intended to be used for unit tests of your logic and your components rather than the DOM quirks.
-
-We recommend that you use a separate tool for browser end-to-end tests if you need them. They are beyond the scope of Create React App.
-
-### Filename Conventions
-
-Jest will look for test files with any of the following popular naming conventions:
-
-* Files with `.js` suffix in `__tests__` folders.
-* Files with `.test.js` suffix.
-* Files with `.spec.js` suffix.
-
-The `.test.js` / `.spec.js` files (or the `__tests__` folders) can be located at any depth under the `src` top level folder.
-
-We recommend to put the test files (or `__tests__` folders) next to the code they are testing so that relative imports appear shorter. For example, if `App.test.js` and `App.js` are in the same folder, the test just needs to `import App from './App'` instead of a long relative path. Colocation also helps find tests more quickly in larger projects.
-
-### Command Line Interface
-
-When you run `npm test`, Jest will launch in the watch mode. Every time you save a file, it will re-run the tests, just like `npm start` recompiles the code.
-
-The watcher includes an interactive command-line interface with the ability to run all tests, or focus on a search pattern. It is designed this way so that you can keep it open and enjoy fast re-runs. You can learn the commands from the “Watch Usage” note that the watcher prints after every run:
-
-![Jest watch mode](http://facebook.github.io/jest/img/blog/15-watch.gif)
-
-### Version Control Integration
-
-By default, when you run `npm test`, Jest will only run the tests related to files changed since the last commit. This is an optimization designed to make your tests runs fast regardless of how many tests you have. However it assumes that you don’t often commit the code that doesn’t pass the tests.
-
-Jest will always explicitly mention that it only ran tests related to the files changed since the last commit. You can also press `a` in the watch mode to force Jest to run all tests.
-
-Jest will always run all tests on a [continuous integration](#continuous-integration) server or if the project is not inside a Git or Mercurial repository.
-
-### Writing Tests
-
-To create tests, add `it()` (or `test()`) blocks with the name of the test and its code. You may optionally wrap them in `describe()` blocks for logical grouping but this is neither required nor recommended.
-
-Jest provides a built-in `expect()` global function for making assertions. A basic test could look like this:
-
-```js
-import sum from './sum';
-
-it('sums numbers', () => {
-  expect(sum(1, 2)).toEqual(3);
-  expect(sum(2, 2)).toEqual(4);
-});
-```
-
-All `expect()` matchers supported by Jest are [extensively documented here](http://facebook.github.io/jest/docs/expect.html).<br>
-You can also use [`jest.fn()` and `expect(fn).toBeCalled()`](http://facebook.github.io/jest/docs/expect.html#tohavebeencalled) to create “spies” or mock functions.
-
-### Testing Components
-
-There is a broad spectrum of component testing techniques. They range from a “smoke test” verifying that a component renders without throwing, to shallow rendering and testing some of the output, to full rendering and testing component lifecycle and state changes.
-
-Different projects choose different testing tradeoffs based on how often components change, and how much logic they contain. If you haven’t decided on a testing strategy yet, we recommend that you start with creating simple smoke tests for your components:
-
-```js
-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
-
-it('renders without crashing', () => {
-  const div = document.createElement('div');
-  ReactDOM.render(<App />, div);
-});
-```
-
-This test mounts a component and makes sure that it didn’t throw during rendering. Tests like this provide a lot value with very little effort so they are great as a starting point, and this is the test you will find in `src/App.test.js`.
-
-When you encounter bugs caused by changing components, you will gain a deeper insight into which parts of them are worth testing in your application. This might be a good time to introduce more specific tests asserting specific expected output or behavior.
-
-If you’d like to test components in isolation from the child components they render, we recommend using [`shallow()` rendering API](http://airbnb.io/enzyme/docs/api/shallow.html) from [Enzyme](http://airbnb.io/enzyme/). You can write a smoke test with it too:
-
-```sh
-npm install --save-dev enzyme react-test-renderer
-```
-
-```js
-import React from 'react';
-import { shallow } from 'enzyme';
-import App from './App';
-
-it('renders without crashing', () => {
-  shallow(<App />);
-});
-```
-
-Unlike the previous smoke test using `ReactDOM.render()`, this test only renders `<App>` and doesn’t go deeper. For example, even if `<App>` itself renders a `<Button>` that throws, this test will pass. Shallow rendering is great for isolated unit tests, but you may still want to create some full rendering tests to ensure the components integrate correctly. Enzyme supports [full rendering with `mount()`](http://airbnb.io/enzyme/docs/api/mount.html), and you can also use it for testing state changes and component lifecycle.
-
-You can read the [Enzyme documentation](http://airbnb.io/enzyme/) for more testing techniques. Enzyme documentation uses Chai and Sinon for assertions but you don’t have to use them because Jest provides built-in `expect()` and `jest.fn()` for spies.
-
-Here is an example from Enzyme documentation that asserts specific output, rewritten to use Jest matchers:
-
-```js
-import React from 'react';
-import { shallow } from 'enzyme';
-import App from './App';
-
-it('renders welcome message', () => {
-  const wrapper = shallow(<App />);
-  const welcome = <h2>Welcome to React</h2>;
-  // expect(wrapper.contains(welcome)).to.equal(true);
-  expect(wrapper.contains(welcome)).toEqual(true);
-});
-```
-
-All Jest matchers are [extensively documented here](http://facebook.github.io/jest/docs/expect.html).<br>
-Nevertheless you can use a third-party assertion library like [Chai](http://chaijs.com/) if you want to, as described below.
-
-Additionally, you might find [jest-enzyme](https://github.com/blainekasten/enzyme-matchers) helpful to simplify your tests with readable matchers. The above `contains` code can be written simpler with jest-enzyme.
-
-```js
-expect(wrapper).toContainReact(welcome)
-```
-
-To setup jest-enzyme with Create React App, follow the instructions for [initializing your test environment](#initializing-test-environment) to import `jest-enzyme`. **Note that currently only version 2.x is compatible with Create React App.**
-
-```sh
-npm install --save-dev jest-enzyme@2.x
-```
-
-```js
-// src/setupTests.js
-import 'jest-enzyme';
-```
-
-
-### Using Third Party Assertion Libraries
-
-We recommend that you use `expect()` for assertions and `jest.fn()` for spies. If you are having issues with them please [file those against Jest](https://github.com/facebook/jest/issues/new), and we’ll fix them. We intend to keep making them better for React, supporting, for example, [pretty-printing React elements as JSX](https://github.com/facebook/jest/pull/1566).
-
-However, if you are used to other libraries, such as [Chai](http://chaijs.com/) and [Sinon](http://sinonjs.org/), or if you have existing code using them that you’d like to port over, you can import them normally like this:
-
-```js
-import sinon from 'sinon';
-import { expect } from 'chai';
-```
-
-and then use them in your tests like you normally do.
-
-### Initializing Test Environment
-
->Note: this feature is available with `react-scripts@0.4.0` and higher.
-
-If your app uses a browser API that you need to mock in your tests or if you just need a global setup before running your tests, add a `src/setupTests.js` to your project. It will be automatically executed before running your tests.
-
-For example:
-
-#### `src/setupTests.js`
-```js
-const localStorageMock = {
-  getItem: jest.fn(),
-  setItem: jest.fn(),
-  clear: jest.fn()
-};
-global.localStorage = localStorageMock
-```
-
-### Focusing and Excluding Tests
-
-You can replace `it()` with `xit()` to temporarily exclude a test from being executed.<br>
-Similarly, `fit()` lets you focus on a specific test without running any other tests.
-
-### Coverage Reporting
-
-Jest has an integrated coverage reporter that works well with ES6 and requires no configuration.<br>
-Run `npm test -- --coverage` (note extra `--` in the middle) to include a coverage report like this:
-
-![coverage report](http://i.imgur.com/5bFhnTS.png)
-
-Note that tests run much slower with coverage so it is recommended to run it separately from your normal workflow.
-
-### Continuous Integration
-
-By default `npm test` runs the watcher with interactive CLI. However, you can force it to run tests once and finish the process by setting an environment variable called `CI`.
-
-When creating a build of your application with `npm run build` linter warnings are not checked by default. Like `npm test`, you can force the build to perform a linter warning check by setting the environment variable `CI`. If any warnings are encountered then the build fails.
-
-Popular CI servers already set the environment variable `CI` by default but you can do this yourself too:
-
-### On CI servers
-#### Travis CI
-
-1. Following the [Travis Getting started](https://docs.travis-ci.com/user/getting-started/) guide for syncing your GitHub repository with Travis.  You may need to initialize some settings manually in your [profile](https://travis-ci.org/profile) page.
-1. Add a `.travis.yml` file to your git repository.
-```
-language: node_js
-node_js:
-  - 4
-  - 6
-cache:
-  directories:
-    - node_modules
-script:
-  - npm test
-  - npm run build
-```
-1. Trigger your first build with a git push.
-1. [Customize your Travis CI Build](https://docs.travis-ci.com/user/customizing-the-build/) if needed.
-
-### On your own environment
-##### Windows (cmd.exe)
-
-```cmd
-set CI=true&&npm test
-```
-
-```cmd
-set CI=true&&npm run build
-```
-
-(Note: the lack of whitespace is intentional.)
-
-##### Linux, macOS (Bash)
-
-```bash
-CI=true npm test
-```
+1. Install dependencies:
 
 ```bash
-CI=true npm run build
-```
-
-The test command will force Jest to run tests once instead of launching the watcher.
-
->  If you find yourself doing this often in development, please [file an issue](https://github.com/facebookincubator/create-react-app/issues/new) to tell us about your use case because we want to make watcher the best experience and are open to changing how it works to accommodate more workflows.
-
-The build command will check for linter warnings and fail if any are found.
-
-### Disabling jsdom
-
-By default, the `package.json` of the generated project looks like this:
-
-```js
-  // ...
-  "scripts": {
-    // ...
-    "test": "react-scripts test --env=jsdom"
-  }
-```
-
-If you know that none of your tests depend on [jsdom](https://github.com/tmpvar/jsdom), you can safely remove `--env=jsdom`, and your tests will run faster.<br>
-To help you make up your mind, here is a list of APIs that **need jsdom**:
-
-* Any browser globals like `window` and `document`
-* [`ReactDOM.render()`](https://facebook.github.io/react/docs/top-level-api.html#reactdom.render)
-* [`TestUtils.renderIntoDocument()`](https://facebook.github.io/react/docs/test-utils.html#renderintodocument) ([a shortcut](https://github.com/facebook/react/blob/34761cf9a252964abfaab6faf74d473ad95d1f21/src/test/ReactTestUtils.js#L83-L91) for the above)
-* [`mount()`](http://airbnb.io/enzyme/docs/api/mount.html) in [Enzyme](http://airbnb.io/enzyme/index.html)
-
-In contrast, **jsdom is not needed** for the following APIs:
-
-* [`TestUtils.createRenderer()`](https://facebook.github.io/react/docs/test-utils.html#shallow-rendering) (shallow rendering)
-* [`shallow()`](http://airbnb.io/enzyme/docs/api/shallow.html) in [Enzyme](http://airbnb.io/enzyme/index.html)
-
-Finally, jsdom is also not needed for [snapshot testing](http://facebook.github.io/jest/blog/2016/07/27/jest-14.html).
-
-### Snapshot Testing
-
-Snapshot testing is a feature of Jest that automatically generates text snapshots of your components and saves them on the disk so if the UI output changes, you get notified without manually writing any assertions on the component output. [Read more about snapshot testing.](http://facebook.github.io/jest/blog/2016/07/27/jest-14.html)
-
-### Editor Integration
-
-If you use [Visual Studio Code](https://code.visualstudio.com), there is a [Jest extension](https://github.com/orta/vscode-jest) which works with Create React App out of the box. This provides a lot of IDE-like features while using a text editor: showing the status of a test run with potential fail messages inline, starting and stopping the watcher automatically, and offering one-click snapshot updates.
-
-![VS Code Jest Preview](https://cloud.githubusercontent.com/assets/49038/20795349/a032308a-b7c8-11e6-9b34-7eeac781003f.png)
-
-<!--
-## Developing Components in Isolation
-
-Usually, in an app, you have a lot of UI components, and each of them has many different states.
-For an example, a simple button component could have following states:
-
-* With a text label.
-* With an emoji.
-* In the disabled mode.
-
-Usually, it’s hard to see these states without running a sample app or some examples.
-
-Create React App doesn’t include any tools for this by default, but you can easily add [React Storybook](https://github.com/kadirahq/react-storybook) to your project. **It is a third-party tool that lets you develop components and see all their states in isolation from your app**.
-
-![React Storybook Demo](http://i.imgur.com/7CIAWpB.gif)
-
-You can also deploy your Storybook as a static app. This way, everyone in your team can view and review different states of UI components without starting a backend server or creating an account in your app.
-
-**Here’s how to setup your app with Storybook:**
-
-First, install the following npm package globally:
-
-```sh
-npm install -g getstorybook
-```
-
-Then, run the following command inside your app’s directory:
-
-```sh
-getstorybook
-```
-
-After that, follow the instructions on the screen.
-
-Learn more about React Storybook:
-
-* Screencast: [Getting Started with React Storybook](https://egghead.io/lessons/react-getting-started-with-react-storybook)
-* [GitHub Repo](https://github.com/kadirahq/react-storybook)
-* [Documentation](https://storybooks.js.org/docs/react-storybook/basics/introduction/)
-* [Snapshot Testing](https://github.com/kadirahq/storyshots) with React Storybook
--->
-
-## Making a Progressive Web App
-
-By default, the production build is a fully functional, offline-first
-[Progressive Web App](https://developers.google.com/web/progressive-web-apps/).
-
-Progressive Web Apps are faster and more reliable than traditional web pages, and provide an engaging mobile experience:
-
- * All static site assets are cached so that your page loads fast on subsequent visits, regardless of network connectivity (such as 2G or 3G). Updates are downloaded in the background.
- * Your app will work regardless of network state, even if offline. This means your users will be able to use your app at 10,000 feet and on the Subway.
- * On mobile devices, your app can be added directly to the user's home screen, app icon and all. You can also re-engage users using web **push notifications**. This eliminates the need for the app store.
-
-The [`sw-precache-webpack-plugin`](https://github.com/goldhand/sw-precache-webpack-plugin)
-is integrated into production configuration,
-and it will take care of generating a service worker file that will automatically
-precache all of your local assets and keep them up to date as you deploy updates.
-The service worker will use a [cache-first strategy](https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#cache-falling-back-to-network)
-for handling all requests for local assets, including the initial HTML, ensuring
-that you web app is reliably fast, even on a slow or unreliable network.
-
-If you would prefer not to enable service workers prior to your initial
-production deployment, then remove the call to `serviceWorkerRegistration.register()`
-from [`src/index.js`](src/index.js).
-
-If you had previously enabled service workers in your production deployment and
-have decided that you would like to disable them for all your existing users,
-you can swap out the call to `serviceWorkerRegistration.register()` in
-[`src/index.js`](src/index.js) with a call to `serviceWorkerRegistration.unregister()`.
-After the user visits a page that has `serviceWorkerRegistration.unregister()`,
-the service worker will be uninstalled.
-
-### Offline-First Considerations
-
-1. Service workers [require HTTPS](https://developers.google.com/web/fundamentals/getting-started/primers/service-workers#you_need_https),
-although to facilitate local testing, that policy
-[does not apply to `localhost`](http://stackoverflow.com/questions/34160509/options-for-testing-service-workers-via-http/34161385#34161385).
-If your production web server does not support HTTPS, then the service worker
-registration will fail, but the rest of your web app will remain functional.
-
-1. Service workers are [not currently supported](https://jakearchibald.github.io/isserviceworkerready/)
-in all web browsers. Service worker registration [won't be attempted](src/registerServiceWorker.js)
-on browsers that lack support.
-
-1. The service worker is only enabled in the [production environment](#deployment),
-e.g. the output of `npm run build`. It's recommended that you do not enable an
-offline-first service worker in a development environment, as it can lead to
-frustration when previously cached assets are used and do not include the latest
-changes you've made locally.
-
-1. If you *need* to test your offline-first service worker locally, build
-the application (using `npm run build`) and run a simple http server from your
-build directory. After running the build script, `create-react-app` will give
-instructions for one way to test your production build locally and the [deployment instructions](#deployment) have
-instructions for using other methods. *Be sure to always use an
-incognito window to avoid complications with your browser cache.*
-
-1. If possible, configure your production environment to serve the generated
-`service-worker.js` [with HTTP caching disabled](http://stackoverflow.com/questions/38843970/service-worker-javascript-update-frequency-every-24-hours).
-If that's not possible—[GitHub Pages](#github-pages), for instance, does not
-allow you to change the default 10 minute HTTP cache lifetime—then be aware
-that if you visit your production site, and then revisit again before
-`service-worker.js` has expired from your HTTP cache, you'll continue to get
-the previously cached assets from the service worker. If you have an immediate
-need to view your updated production deployment, performing a shift-refresh
-will temporarily disable the service worker and retrieve all assets from the
-network.
-
-1. Users aren't always familiar with offline-first web apps. It can be useful to
-[let the user know](https://developers.google.com/web/fundamentals/instant-and-offline/offline-ux#inform_the_user_when_the_app_is_ready_for_offline_consumption)
-when the service worker has finished populating your caches (showing a "This web
-app works offline!" message) and also let them know when the service worker has
-fetched the latest updates that will be available the next time they load the
-page (showing a "New content is available; please refresh." message). Showing
-this messages is currently left as an exercise to the developer, but as a
-starting point, you can make use of the logic included in [`src/registerServiceWorker.js`](src/registerServiceWorker.js), which
-demonstrates which service worker lifecycle events to listen for to detect each
-scenario, and which as a default, just logs appropriate messages to the
-JavaScript console.
-
-1. By default, the generated service worker file will not intercept or cache any
-cross-origin traffic, like HTTP [API requests](#integrating-with-an-api-backend),
-images, or embeds loaded from a different domain. If you would like to use a
-runtime caching strategy for those requests, you can [`eject`](#npm-run-eject)
-and then configure the
-[`runtimeCaching`](https://github.com/GoogleChrome/sw-precache#runtimecaching-arrayobject)
-option in the `SWPrecacheWebpackPlugin` section of
-[`webpack.config.prod.js`](../config/webpack.config.prod.js).
-
-### Progressive Web App Metadata
-
-The default configuration includes a web app manifest located at
-[`public/manifest.json`](public/manifest.json), that you can customize with
-details specific to your web application.
-
-When a user adds a web app to their homescreen using Chrome or Firefox on
-Android, the metadata in [`manifest.json`](public/manifest.json) determines what
-icons, names, and branding colors to use when the web app is displayed.
-[The Web App Manifest guide](https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/)
-provides more context about what each field means, and how your customizations
-will affect your users' experience.
-
-## Deployment
-
-`npm run build` creates a `build` directory with a production build of your app. Set up your favourite HTTP server so that a visitor to your site is served `index.html`, and requests to static paths like `/static/js/main.<hash>.js` are served with the contents of the `/static/js/main.<hash>.js` file.
-
-### Static Server
-
-For environments using [Node](https://nodejs.org/), the easiest way to handle this would be to install [serve](https://github.com/zeit/serve) and let it handle the rest:
-
-```sh
-npm install -g serve
-serve -s build
-```
-
-The last command shown above will serve your static site on the port **5000**. Like many of [serve](https://github.com/zeit/serve)’s internal settings, the port can be adjusted using the `-p` or `--port` flags.
-
-Run this command to get a full list of the options available:
-
-```sh
-serve -h
-```
-
-### Other Solutions
-
-You don’t necessarily need a static server in order to run a Create React App project in production. It works just as fine integrated into an existing dynamic one.
-
-Here’s a programmatic example using [Node](https://nodejs.org/) and [Express](http://expressjs.com/):
-
-```javascript
-const express = require('express');
-const path = require('path');
-const app = express();
-
-app.use(express.static(path.join(__dirname, 'build')));
-
-app.get('/', function (req, res) {
-  res.sendFile(path.join(__dirname, 'build', 'index.html'));
-});
-
-app.listen(9000);
-```
-
-The choice of your server software isn’t important either. Since Create React App is completely platform-agnostic, there’s no need to explicitly use Node.
-
-The `build` folder with static assets is the only output produced by Create React App.
-
-However this is not quite enough if you use client-side routing. Read the next section if you want to support URLs like `/todos/42` in your single-page app.
-
-### Serving Apps with Client-Side Routing
-
-If you use routers that use the HTML5 [`pushState` history API](https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries) under the hood (for example, [React Router](https://github.com/ReactTraining/react-router) with `browserHistory`), many static file servers will fail. For example, if you used React Router with a route for `/todos/42`, the development server will respond to `localhost:3000/todos/42` properly, but an Express serving a production build as above will not.
-
-This is because when there is a fresh page load for a `/todos/42`, the server looks for the file `build/todos/42` and does not find it. The server needs to be configured to respond to a request to `/todos/42` by serving `index.html`. For example, we can amend our Express example above to serve `index.html` for any unknown paths:
-
-```diff
- app.use(express.static(path.join(__dirname, 'build')));
-
--app.get('/', function (req, res) {
-+app.get('/*', function (req, res) {
-   res.sendFile(path.join(__dirname, 'build', 'index.html'));
- });
-```
-
-If you’re using [Apache](https://httpd.apache.org/), you need to create a `.htaccess` file in the `public` folder that looks like this:
-
-```
-    Options -MultiViews
-    RewriteEngine On
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^ index.html [QSA,L]
-```
-
-It will get copied to the `build` folder when you run `npm run build`.
-
-Now requests to `/todos/42` will be handled correctly both in development and in production.
-
-On a production build, and in a browser that supports [service workers](https://developers.google.com/web/fundamentals/getting-started/primers/service-workers),
-the service worker will automatically handle all navigation requests, like for
-`/todos/42`, by serving the cached copy of your `index.html`. This
-service worker navigation routing can be configured or disabled by
-[`eject`ing](#npm-run-eject) and then modifying the
-[`navigateFallback`](https://github.com/GoogleChrome/sw-precache#navigatefallback-string)
-and [`navigateFallbackWhitelist`](https://github.com/GoogleChrome/sw-precache#navigatefallbackwhitelist-arrayregexp)
-options of the `SWPreachePlugin` [configuration](../config/webpack.config.prod.js).
-
-### Building for Relative Paths
-
-By default, Create React App produces a build assuming your app is hosted at the server root.<br>
-To override this, specify the `homepage` in your `package.json`, for example:
-
-```js
-  "homepage": "http://mywebsite.com/relativepath",
-```
-
-This will let Create React App correctly infer the root path to use in the generated HTML file.
-
-#### Serving the Same Build from Different Paths
-
->Note: this feature is available with `react-scripts@0.9.0` and higher.
-
-If you are not using the HTML5 `pushState` history API or not using client-side routing at all, it is unnecessary to specify the URL from which your app will be served. Instead, you can put this in your `package.json`:
-
-```js
-  "homepage": ".",
-```
-
-This will make sure that all the asset paths are relative to `index.html`. You will then be able to move your app from `http://mywebsite.com` to `http://mywebsite.com/relativepath` or even `http://mywebsite.com/relative/path` without having to rebuild it.
-
-### Azure
-
-See [this](https://medium.com/@to_pe/deploying-create-react-app-on-microsoft-azure-c0f6686a4321) blog post on how to deploy your React app to [Microsoft Azure](https://azure.microsoft.com/).
-
-### Firebase
-
-Install the Firebase CLI if you haven’t already by running `npm install -g firebase-tools`. Sign up for a [Firebase account](https://console.firebase.google.com/) and create a new project. Run `firebase login` and login with your previous created Firebase account.
-
-Then run the `firebase init` command from your project’s root. You need to choose the **Hosting: Configure and deploy Firebase Hosting sites** and choose the Firebase project you created in the previous step. You will need to agree with `database.rules.json` being created, choose `build` as the public directory, and also agree to **Configure as a single-page app** by replying with `y`.
-
-```sh
-    === Project Setup
-
-    First, let's associate this project directory with a Firebase project.
-    You can create multiple project aliases by running firebase use --add,
-    but for now we'll just set up a default project.
-
-    ? What Firebase project do you want to associate as default? Example app (example-app-fd690)
-
-    === Database Setup
-
-    Firebase Realtime Database Rules allow you to define how your data should be
-    structured and when your data can be read from and written to.
-
-    ? What file should be used for Database Rules? database.rules.json
-    ✔  Database Rules for example-app-fd690 have been downloaded to database.rules.json.
-    Future modifications to database.rules.json will update Database Rules when you run
-    firebase deploy.
-
-    === Hosting Setup
-
-    Your public directory is the folder (relative to your project directory) that
-    will contain Hosting assets to uploaded with firebase deploy. If you
-    have a build process for your assets, use your build's output directory.
-
-    ? What do you want to use as your public directory? build
-    ? Configure as a single-page app (rewrite all urls to /index.html)? Yes
-    ✔  Wrote build/index.html
-
-    i  Writing configuration info to firebase.json...
-    i  Writing project information to .firebaserc...
-
-    ✔  Firebase initialization complete!
-```
-
-Now, after you create a production build with `npm run build`, you can deploy it by running `firebase deploy`.
-
-```sh
-    === Deploying to 'example-app-fd690'...
-
-    i  deploying database, hosting
-    ✔  database: rules ready to deploy.
-    i  hosting: preparing build directory for upload...
-    Uploading: [==============================          ] 75%✔  hosting: build folder uploaded successfully
-    ✔  hosting: 8 files uploaded successfully
-    i  starting release process (may take several minutes)...
-
-    ✔  Deploy complete!
-
-    Project Console: https://console.firebase.google.com/project/example-app-fd690/overview
-    Hosting URL: https://example-app-fd690.firebaseapp.com
-```
-
-For more information see [Add Firebase to your JavaScript Project](https://firebase.google.com/docs/web/setup).
-
-### GitHub Pages
-
->Note: this feature is available with `react-scripts@0.2.0` and higher.
-
-#### Step 1: Add `homepage` to `package.json`
-
-**The step below is important!**<br>
-**If you skip it, your app will not deploy correctly.**
-
-Open your `package.json` and add a `homepage` field:
-
-```js
-  "homepage": "https://myusername.github.io/my-app",
-```
-
-Create React App uses the `homepage` field to determine the root URL in the built HTML file.
-
-#### Step 2: Install `gh-pages` and add `deploy` to `scripts` in `package.json`
-
-Now, whenever you run `npm run build`, you will see a cheat sheet with instructions on how to deploy to GitHub Pages.
-
-To publish it at [https://myusername.github.io/my-app](https://myusername.github.io/my-app), run:
-
-```sh
-npm install --save-dev gh-pages
-```
-
-Add the following scripts in your `package.json`:
-
-```js
-  // ...
-  "scripts": {
-    // ...
-    "predeploy": "npm run build",
-    "deploy": "gh-pages -d build"
-  }
-```
-
-The `predeploy` script will run automatically before `deploy` is run.
-
-#### Step 3: Deploy the site by running `npm run deploy`
-
-Then run:
-
-```sh
-npm run deploy
-```
-
-#### Step 4: Ensure your project’s settings use `gh-pages`
-
-Finally, make sure **GitHub Pages** option in your GitHub project settings is set to use the `gh-pages` branch:
-
-<img src="http://i.imgur.com/HUjEr9l.png" width="500" alt="gh-pages branch setting">
-
-#### Step 5: Optionally, configure the domain
-
-You can configure a custom domain with GitHub Pages by adding a `CNAME` file to the `public/` folder.
-
-#### Notes on client-side routing
-
-GitHub Pages doesn’t support routers that use the HTML5 `pushState` history API under the hood (for example, React Router using `browserHistory`). This is because when there is a fresh page load for a url like `http://user.github.io/todomvc/todos/42`, where `/todos/42` is a frontend route, the GitHub Pages server returns 404 because it knows nothing of `/todos/42`. If you want to add a router to a project hosted on GitHub Pages, here are a couple of solutions:
-
-* You could switch from using HTML5 history API to routing with hashes. If you use React Router, you can switch to `hashHistory` for this effect, but the URL will be longer and more verbose (for example, `http://user.github.io/todomvc/#/todos/42?_k=yknaj`). [Read more](https://github.com/reactjs/react-router/blob/master/docs/guides/Histories.md#histories) about different history implementations in React Router.
-* Alternatively, you can use a trick to teach GitHub Pages to handle 404 by redirecting to your `index.html` page with a special redirect parameter. You would need to add a `404.html` file with the redirection code to the `build` folder before deploying your project, and you’ll need to add code handling the redirect parameter to `index.html`. You can find a detailed explanation of this technique [in this guide](https://github.com/rafrex/spa-github-pages).
-
-### Heroku
-
-Use the [Heroku Buildpack for Create React App](https://github.com/mars/create-react-app-buildpack).<br>
-You can find instructions in [Deploying React with Zero Configuration](https://blog.heroku.com/deploying-react-with-zero-configuration).
-
-#### Resolving Heroku Deployment Errors
-
-Sometimes `npm run build` works locally but fails during deploy via Heroku. Following are the most common cases.
-
-##### "Module not found: Error: Cannot resolve 'file' or 'directory'"
-
-If you get something like this:
-
-```
-remote: Failed to create a production build. Reason:
-remote: Module not found: Error: Cannot resolve 'file' or 'directory'
-MyDirectory in /tmp/build_1234/src
-```
-
-It means you need to ensure that the lettercase of the file or directory you `import` matches the one you see on your filesystem or on GitHub.
-
-This is important because Linux (the operating system used by Heroku) is case sensitive. So `MyDirectory` and `mydirectory` are two distinct directories and thus, even though the project builds locally, the difference in case breaks the `import` statements on Heroku remotes.
-
-##### "Could not find a required file."
-
-If you exclude or ignore necessary files from the package you will see a error similar this one:
-
-```
-remote: Could not find a required file.
-remote:   Name: `index.html`
-remote:   Searched in: /tmp/build_a2875fc163b209225122d68916f1d4df/public
-remote:
-remote: npm ERR! Linux 3.13.0-105-generic
-remote: npm ERR! argv "/tmp/build_a2875fc163b209225122d68916f1d4df/.heroku/node/bin/node" "/tmp/build_a2875fc163b209225122d68916f1d4df/.heroku/node/bin/npm" "run" "build"
-```
-
-In this case, ensure that the file is there with the proper lettercase and that’s not ignored on your local `.gitignore` or `~/.gitignore_global`.
-
-### Modulus
-
-See the [Modulus blog post](http://blog.modulus.io/deploying-react-apps-on-modulus) on how to deploy your react app to Modulus.
-
-### Netlify
-
-**To do a manual deploy to Netlify’s CDN:**
-
-```sh
-npm install netlify-cli
-netlify deploy
-```
-
-Choose `build` as the path to deploy.
-
-**To setup continuous delivery:**
-
-With this setup Netlify will build and deploy when you push to git or open a pull request:
-
-1. [Start a new netlify project](https://app.netlify.com/signup)
-2. Pick your Git hosting service and select your repository
-3. Click `Build your site`
-
-**Support for client-side routing:**
-
-To support `pushState`, make sure to create a `public/_redirects` file with the following rewrite rules:
-
-```
-/*  /index.html  200
-```
-
-When you build the project, Create React App will place the `public` folder contents into the build output.
-
-### Now
-
-[now](https://zeit.co/now) offers a zero-configuration single-command deployment. You can use `now` to deploy your app for free.
-
-1. Install the `now` command-line tool either via the recommended [desktop tool](https://zeit.co/download) or via node with `npm install -g now`.
-
-2. Build your app by running `npm run build`.
-
-3. Move into the build directory by running `cd build`.
-
-4. Run `now --name your-project-name` from within the build directory. You will see a **now.sh** URL in your output like this:
-
-    ```
-    > Ready! https://your-project-name-tpspyhtdtk.now.sh (copied to clipboard)
-    ```
-
-    Paste that URL into your browser when the build is complete, and you will see your deployed app.
-
-Details are available in [this article.](https://zeit.co/blog/unlimited-static)
-
-### S3 and CloudFront
-
-See this [blog post](https://medium.com/@omgwtfmarc/deploying-create-react-app-to-s3-or-cloudfront-48dae4ce0af) on how to deploy your React app to Amazon Web Services [S3](https://aws.amazon.com/s3) and [CloudFront](https://aws.amazon.com/cloudfront/).
-
-### Surge
-
-Install the Surge CLI if you haven’t already by running `npm install -g surge`. Run the `surge` command and log in you or create a new account.
-
-When asked about the project path, make sure to specify the `build` folder, for example:
-
-```sh
-       project path: /path/to/project/build
+npm install
 ```
 
-Note that in order to support routers that use HTML5 `pushState` API, you may want to rename the `index.html` in your build folder to `200.html` before deploying to Surge. This [ensures that every URL falls back to that file](https://surge.sh/help/adding-a-200-page-for-client-side-routing).
-
-## Advanced Configuration
-
-You can adjust various development and production settings by setting environment variables in your shell or with [.env](#adding-development-environment-variables-in-env).
-
-Variable | Development | Production | Usage
-:--- | :---: | :---: | :---
-BROWSER | :white_check_mark: | :x: | By default, Create React App will open the default system browser, favoring Chrome on macOS. Specify a [browser](https://github.com/sindresorhus/opn#app) to override this behavior, or set it to `none` to disable it completely. If you need to customize the way the browser is launched, you can specify a node script instead. Any arguments passed to `npm start` will also be passed to this script, and the url where your app is served will be the last argument. Your script's file name must have the `.js` extension.
-HOST | :white_check_mark: | :x: | By default, the development web server binds to `localhost`. You may use this variable to specify a different host.
-PORT | :white_check_mark: | :x: | By default, the development web server will attempt to listen on port 3000 or prompt you to attempt the next available port. You may use this variable to specify a different port.
-HTTPS | :white_check_mark: | :x: | When set to `true`, Create React App will run the development server in `https` mode.
-PUBLIC_URL | :x: | :white_check_mark: | Create React App assumes your application is hosted at the serving web server's root or a subpath as specified in [`package.json` (`homepage`)](#building-for-relative-paths). Normally, Create React App ignores the hostname. You may use this variable to force assets to be referenced verbatim to the url you provide (hostname included). This may be particularly useful when using a CDN to host your application.
-CI | :large_orange_diamond: | :white_check_mark: | When set to `true`, Create React App treats warnings as failures in the build. It also makes the test runner non-watching. Most CIs set this flag by default.
-
-## Troubleshooting
-
-### `npm start` doesn’t detect changes
-
-When you save a file while `npm start` is running, the browser should refresh with the updated code.<br>
-If this doesn’t happen, try one of the following workarounds:
-
-* If your project is in a Dropbox folder, try moving it out.
-* If the watcher doesn’t see a file called `index.js` and you’re referencing it by the folder name, you [need to restart the watcher](https://github.com/facebookincubator/create-react-app/issues/1164) due to a Webpack bug.
-* Some editors like Vim and IntelliJ have a “safe write” feature that currently breaks the watcher. You will need to disable it. Follow the instructions in [“Adjusting Your Text Editor”](https://webpack.js.org/guides/development/#adjusting-your-text-editor).
-* If your project path contains parentheses, try moving the project to a path without them. This is caused by a [Webpack watcher bug](https://github.com/webpack/watchpack/issues/42).
-* On Linux and macOS, you might need to [tweak system settings](https://webpack.github.io/docs/troubleshooting.html#not-enough-watchers) to allow more watchers.
-* If the project runs inside a virtual machine such as (a Vagrant provisioned) VirtualBox, create an `.env` file in your project directory if it doesn’t exist, and add `CHOKIDAR_USEPOLLING=true` to it. This ensures that the next time you run `npm start`, the watcher uses the polling mode, as necessary inside a VM.
-
-If none of these solutions help please leave a comment [in this thread](https://github.com/facebookincubator/create-react-app/issues/659).
-
-### `npm test` hangs on macOS Sierra
-
-If you run `npm test` and the console gets stuck after printing `react-scripts test --env=jsdom` to the console there might be a problem with your [Watchman](https://facebook.github.io/watchman/) installation as described in [facebookincubator/create-react-app#713](https://github.com/facebookincubator/create-react-app/issues/713).
-
-We recommend deleting `node_modules` in your project and running `npm install` (or `yarn` if you use it) first. If it doesn't help, you can try one of the numerous workarounds mentioned in these issues:
+2. Make sure the backend services in ../devops/ are running.
 
-* [facebook/jest#1767](https://github.com/facebook/jest/issues/1767)
-* [facebook/watchman#358](https://github.com/facebook/watchman/issues/358)
-* [ember-cli/ember-cli#6259](https://github.com/ember-cli/ember-cli/issues/6259)
+3. Run the app:
 
-It is reported that installing Watchman 4.7.0 or newer fixes the issue. If you use [Homebrew](http://brew.sh/), you can run these commands to update it:
-
-```
-watchman shutdown-server
-brew update
-brew reinstall watchman
+```bash
+npm start
 ```
 
-You can find [other installation methods](https://facebook.github.io/watchman/docs/install.html#build-install) on the Watchman documentation page.
-
-If this still doesn’t help, try running `launchctl unload -F ~/Library/LaunchAgents/com.github.facebook.watchman.plist`.
-
-There are also reports that *uninstalling* Watchman fixes the issue. So if nothing else helps, remove it from your system and try again.
-
-### `npm run build` silently fails
-
-It is reported that `npm run build` can fail on machines with no swap space, which is common in cloud environments. If [the symptoms are matching](https://github.com/facebookincubator/create-react-app/issues/1133#issuecomment-264612171), consider adding some swap space to the machine you’re building on, or build the project locally.
-
-### `npm run build` fails on Heroku
+4. Create a release build for deployment:
 
-This may be a problem with case sensitive filenames.
-Please refer to [this section](#resolving-heroku-deployment-errors).
-
-### Moment.js locales are missing
-
-If you use a [Moment.js](https://momentjs.com/), you might notice that only the English locale is available by default. This is because the locale files are large, and you probably only need a subset of [all the locales provided by Moment.js](https://momentjs.com/#multiple-locale-support).
-
-To add a specific Moment.js locale to your bundle, you need to import it explicitly.<br>
-For example:
-
-```js
-import moment from 'moment';
-import 'moment/locale/fr';
+```bash
+npm run build
 ```
 
-If import multiple locales this way, you can later switch between them by calling `moment.locale()` with the locale name:
-
-```js
-import moment from 'moment';
-import 'moment/locale/fr';
-import 'moment/locale/es';
+5. If you need to log in:
 
-// ...
-
-moment.locale('fr');
-```
+- uncomment the local API url var in .env.development or create an override (.env.development.local)
+- restart the app, so your own API server will get used
+- try logging in; this will create an account in the couchdb instance
+- log in to couchdb — [see here](../devops/dev/README)
+- change the new user's role to "superadmin" in the *accounts* store and save
+- log in
 
-This will only work for locales that have been explicitly imported before.
 
-## Something Missing?
+To see the detailed *Create React App* documentation go [here](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md).
 
-If you have ideas for more “How To” recipes that should be on this page, [let us know](https://github.com/facebookincubator/create-react-app/issues) or [contribute some!](https://github.com/facebookincubator/create-react-app/edit/master/packages/react-scripts/template/README.md)
diff --git a/web-app/public/index.html b/web-app/public/index.html
index 8390fa0436..a454f27505 100644
--- a/web-app/public/index.html
+++ b/web-app/public/index.html
@@ -20,7 +20,7 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
     <link href="https://fonts.googleapis.com/css?family=Noto+Sans:400,700" rel="stylesheet">
-    <script src="https://maps.googleapis.com/maps/api/js?v=3.27&libraries=places,geometry&key=AIzaSyD0AC9TcY3xdmRsc_atlSHRreEbnEbxPEA"></script>
+    <script src="https://maps.googleapis.com/maps/api/js?v=3.31&libraries=places,geometry&key=AIzaSyD0AC9TcY3xdmRsc_atlSHRreEbnEbxPEA"></script>
     <title>World Cleanup</title>
   </head>
   <body>
diff --git a/web-app/src/components/Details/Details.js b/web-app/src/components/Details/Details.js
index 365bc1d1dc..c96715743f 100644
--- a/web-app/src/components/Details/Details.js
+++ b/web-app/src/components/Details/Details.js
@@ -23,6 +23,7 @@ class Details extends Component {
         createdByName,
         updatedByName,
         thumbnails,
+        mediumPhotos,
         composition,
         hashtags,
         amount,
@@ -66,7 +67,11 @@ class Details extends Component {
           />
         </div>
         <div className="Details-default-container">
-          <TrashPhotos photos={(thumbnails || []).map(t => t.url)} />
+          <TrashPhotos photos={(thumbnails || []).map(thumbnail => ({
+            thumbnailUrl: thumbnail.url,
+            mediumPhotoUrl: mediumPhotos.find((mediumPhoto) => mediumPhoto.id === thumbnail.parentId).url,
+          }))}
+          />
         </div>
         <div className="Details-default-container">
           <TrashAmount disabled amount={amount} />
diff --git a/web-app/src/components/Details/TrashPhotos.js b/web-app/src/components/Details/TrashPhotos.js
index 6576759912..9e3a4e9acd 100644
--- a/web-app/src/components/Details/TrashPhotos.js
+++ b/web-app/src/components/Details/TrashPhotos.js
@@ -1,60 +1,94 @@
-import React from 'react';
+import React, { Component } from 'react';
 import Dropzone from 'react-dropzone';
 
 import { noop } from '../../shared/helpers';
+import { PhotoModal } from '../../components/PhotoModal';
 import './TrashPhotos.css';
 
-const TrashPhotos = ({ photos, canEdit, onAddClick, onDeleteClick }) =>
-  (<div className="TrashPhotos">
-    <span className="TrashPhotos-title">Trash photos</span>
-    <div className="TrashPhotos-images-container">
-      {photos.map((photo, index) =>
-        (<div key={index} className="TrashPhotos-img-container">
-          <img src={photo} alt="" key={index} />
-          {canEdit &&
-            <button onClick={() => onDeleteClick(index)}>X</button>}
-        </div>),
-      )}
-      {onAddClick &&
-        <div
-          style={{
-            cursor: 'pointer',
-            marginLeft: photos.length > 0 ? '5px' : '0px',
-          }}
-        >
-          <Dropzone
-            style={{
-              width: '85px',
-              height: '70px',
-              backgroundColor: '#d8d8d8',
-              display: 'flex',
-              alignItems: 'flex-end',
-              justifyContent: 'flex-start',
-            }}
-            multiple={false}
-            onDrop={onAddClick}
-            accept="image/*"
-          >
+class TrashPhotos extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      showZoomedPhoto: false,
+    };
+  }
+
+  handlePhotoModalClose = () => {
+    this.setState({
+      showZoomedPhoto: false,
+    });
+  };
+
+  handleThumbnailClick = index => {
+    const { photos } = this.props;
+    this.setState({
+      zoomedPhotoUrl: photos[index].mediumPhotoUrl,
+      showZoomedPhoto: true,
+    });
+  }
+
+  render() {
+    const {
+      photos,
+      canEdit,
+      onDeleteClick,
+      onAddClick,
+    } = this.props;
+    return (
+      <div className="TrashPhotos">
+        <PhotoModal photoUrl={this.state.zoomedPhotoUrl} isOpen={this.state.showZoomedPhoto} onClose={this.handlePhotoModalClose} />
+        <span className="TrashPhotos-title">Trash photos</span>
+        <div className="TrashPhotos-images-container">
+          {photos.map((photo, index) =>
+            (<div key={index} onClick={() => this.handleThumbnailClick(index)} className="TrashPhotos-img-container">
+              <img src={photo.thumbnailUrl} alt="" key={index} />
+              {canEdit &&
+                <button onClick={() => onDeleteClick(index)}>X</button>}
+            </div>),
+          )}
+          {onAddClick &&
             <div
               style={{
-                height: '20px',
-                width: '20px',
-                fontSize: '16px',
-                color: 'white',
-                backgroundColor: '#4aa5ff',
-                margin: '5px',
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'center',
-                borderRadius: '2px',
+                cursor: 'pointer',
+                marginLeft: photos.length > 0 ? '5px' : '0px',
               }}
             >
-              <p style={{ textAlign: 'center' }}>+</p>
-            </div>
-          </Dropzone>
-        </div>}
-    </div>
-  </div>);
+              <Dropzone
+                style={{
+                  width: '85px',
+                  height: '70px',
+                  backgroundColor: '#d8d8d8',
+                  display: 'flex',
+                  alignItems: 'flex-end',
+                  justifyContent: 'flex-start',
+                }}
+                multiple={false}
+                onDrop={onAddClick}
+                accept="image/*"
+              >
+                <div
+                  style={{
+                    height: '20px',
+                    width: '20px',
+                    fontSize: '16px',
+                    color: 'white',
+                    backgroundColor: '#4aa5ff',
+                    margin: '5px',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    borderRadius: '2px',
+                  }}
+                >
+                  <p style={{ textAlign: 'center' }}>+</p>
+                </div>
+              </Dropzone>
+            </div>}
+        </div>
+      </div>
+    );
+  }
+}
 
 TrashPhotos.defaultProps = {
   photos: [],
diff --git a/web-app/src/components/MapView/components/GoogleMap.js b/web-app/src/components/MapView/components/GoogleMap.js
index c137a31573..ee0864a434 100644
--- a/web-app/src/components/MapView/components/GoogleMap.js
+++ b/web-app/src/components/MapView/components/GoogleMap.js
@@ -19,8 +19,10 @@ export default withGoogleMap(props => {
   } = props;
 
   const mapOptions = {
-    mapTypeControl: false,
+    mapTypeControl: true,
+    mapTypeControlOptions: { position: 3 /* TOP_RIGHT */ },
     streetViewControl: false,
+    scaleControl: true,
     minZoom: 3,
   };
   if (cursor) {
diff --git a/web-app/src/components/PhotoModal/PhotoModal.css b/web-app/src/components/PhotoModal/PhotoModal.css
new file mode 100644
index 0000000000..c366ebed55
--- /dev/null
+++ b/web-app/src/components/PhotoModal/PhotoModal.css
@@ -0,0 +1,4 @@
+.content > img {
+    max-width: 700px;
+    max-height: 700px;
+}
\ No newline at end of file
diff --git a/web-app/src/components/PhotoModal/PhotoModal.js b/web-app/src/components/PhotoModal/PhotoModal.js
new file mode 100644
index 0000000000..d8e739b6eb
--- /dev/null
+++ b/web-app/src/components/PhotoModal/PhotoModal.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Modal from 'react-modal';
+
+import closeButton from '../../assets/closeButton.png';
+import { SHARED_MODAL_STYLES } from '../../shared/constants';
+import "./PhotoModal.css";
+
+const PhotoModal = ({ onClose, photoUrl, isOpen }) => (
+  <Modal isOpen={isOpen} style={SHARED_MODAL_STYLES} contentLabel="">
+    <button className="Shared-modal-close-button" onClick={onClose}>
+      <img src={closeButton} alt="" />
+    </button>
+    <div className="content">
+      <img src={photoUrl} />
+    </div>
+  </Modal>
+);
+
+PhotoModal.propTypes = {
+  onClose: PropTypes.func,
+  photoUrl: PropTypes.string,
+  isOpen: PropTypes.bool,
+};
+
+export default PhotoModal;
diff --git a/web-app/src/components/PhotoModal/index.js b/web-app/src/components/PhotoModal/index.js
new file mode 100644
index 0000000000..f6f08968b2
--- /dev/null
+++ b/web-app/src/components/PhotoModal/index.js
@@ -0,0 +1 @@
+export { default as PhotoModal } from './PhotoModal';
diff --git a/web-app/src/routes/Home/Home.css b/web-app/src/routes/Home/Home.css
index 568a7893d0..a4364da82f 100644
--- a/web-app/src/routes/Home/Home.css
+++ b/web-app/src/routes/Home/Home.css
@@ -62,11 +62,11 @@
 .Home-create-marker-button span {
     text-align: center;
     height: 20px;
-    width: 123px;
+    min-width: 123px;
     color: #FFFFFF;
     font-family: "Noto Sans";
     font-size: 15px;
     font-weight: bold;
     line-height: 20px;
     text-align: center;
-}
\ No newline at end of file
+}
diff --git a/web-app/src/services/Api.js b/web-app/src/services/Api.js
index 4f9adaacdd..b6126f8d6b 100644
--- a/web-app/src/services/Api.js
+++ b/web-app/src/services/Api.js
@@ -79,11 +79,12 @@ class ApiService {
   }
 }
 const IS_PRODUCTION = window.location.host === 'app.worldcleanupday.com';
-// export const BASE_URL = 'http://10.100.1.143:60000/api/v1'
 
 export const BASE_URL =
   process.env.NODE_ENV === 'development'
-    ? 'https://api-qa.app.worldcleanupday.com/api/v1'
+    ? process.env.REACT_APP_LOCAL_API
+      ? process.env.REACT_APP_LOCAL_API
+      : 'https://api-qa.app.worldcleanupday.com/api/v1'
     : IS_PRODUCTION
     ? `${window.location.protocol}//api.${window.location.host}/api/v1`
     : `${window.location.protocol}//api-${window.location.host}/api/v1`;
diff --git a/web-app/src/shared/constants.js b/web-app/src/shared/constants.js
index c63c13a9c9..2fb49ceb6d 100644
--- a/web-app/src/shared/constants.js
+++ b/web-app/src/shared/constants.js
@@ -1,5 +1,5 @@
 export const GOOGLE_MAPS_API_KEY = 'AIzaSyD0AC9TcY3xdmRsc_atlSHRreEbnEbxPEA';
-export const googleMapURL = `https://maps.googleapis.com/maps/api/js?v=3.27&libraries=places,geometry&key=${GOOGLE_MAPS_API_KEY}`;
+export const googleMapURL = `https://maps.googleapis.com/maps/api/js?v=3.31&libraries=places,geometry&key=${GOOGLE_MAPS_API_KEY}`;
 export const DEFAULT_ZOOM_LEVEL = 18;
 export const NO_PERMISSION_ZOOM_LEVEL = 9;
 export const ESTONIA_CENTER_COORDINATES = { lat: 58.5953, lng: 25.0136 };