Merge pull request #542 from SecUpwN/development

Unchaining WIP-Release v0.1.32-alpha-build-00

.travis.yml

@@ -76,5 +76,5 @@ addons:
 # Scan results: http://scan.coverity.com/projects/3346
     build_command_prepend: "./gradlew clean"
     build_command: "./gradlew build"
-    branch_pattern: development
+    branch_pattern: master
     build_script_url: https://spideroak.com/share/IFEU2U2JINCA/GitHub/home/SecUpwN/SpiderOak/MISC/external/travisci_build_coverity_scan.sh

CHANGELOG.md

 # CHANGELOG of 'AIMSICD'
 ----------------------
 
+#### [12.07.2015 - WIP-Release v0.1.32-alpha-build-00](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/releases/tag/v0.1.32-alpha-b00)
+
+* Updated: Enhanced `AIMSICD.java` for another attempt to fix AIMSICD not closing
+* Updated: French, Polish and Russian translations, added: Czech and Swedish
+* Updated: More updates of MWI detection strings with fixes to avoid failing build
+* Added: Small note in `CONTRIBUTING.md` to actually *finish* the started translations
+* Fixed: Reverted lacells pull request because it caused blockings and exceptions
+
+---
+
+#### 07.07.2015 - WIP-Internal v0.1.31-alpha-build-05
+
+* Changed: Switched Coverity Scan analysis to `master` to avoid Travis-CI failures
+* Updated: Improved French, German and Polish translations (needs more translators)
+* Fixed: Corrected Type-0 silent SMS popup display and tried to fix app not closing
+
+---
+
+#### 07.07.2015 - WIP-Internal v0.1.31-alpha-build-04
+
+* Updated: German translations have been improved upon changes in source strings
+* Fixed: Corrected MWI code and removed unnecessary spaces from detection popup
+
+---
+
+#### 07.07.2015 - WIP-Internal v0.1.31-alpha-build-03
+
+* Updated: German translations have been improved upon changes in source strings
+* Removed: Purged E-Mail address to send logfiles to - a better way will come soon!
+* Removed: Purged invitation to send logfiles for every single detection event
+
+---
+
+#### 07.07.2015 - WIP-Internal v0.1.31-alpha-build-02
+
+* Added: New table for detection tests of Type-0 silent SMS and MWI in [Special SMS](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/wiki/Special-SMS)
+* Fixed: Declared Message Waiting Indicator strings correctly in our detection code
+
+---
+
+#### 07.07.2015 - WIP-Internal v0.1.31-alpha-build-01
+
+* Updated: Enhanced Type-0 silent SMS detection with main buffer to logcat scraper
+* Updated: Translations via Weblate are now finally getting pulled in automatically
+* Updated: Thanked [thechangelog](https://github.com/thechangelog) in our `CREDITS` for their public announcements
+* Added: Translations into English, German, French, Polish, Japanese and Russian
+
+---
+
 #### [05.07.2015 - WIP-Release v0.1.31-alpha-build-00](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/releases/tag/v0.1.31-alpha-b00)
 
 * Removed: Commented out unused imports and re-ordered variable declarations
 * Updated: Shortened badge of `Development Status` in `README` for better display
-* Added: More clarifying code co´mments in `CellTracker.java`
+* Added: More clarifying code comments in `CellTracker.java`
 
 #### 05.07.2015 - WIP-Internal v0.1.30-alpha-build-16
 
@@ -27,7 +76,7 @@
 #### 03.07.2015 - WIP-Internal v0.1.30-alpha-build-13
 
 * Fixed: Comments in `RequestTask.java` have been fixed to reflect code changes
-* Fixed: Silenced some spammy XPrivacy items using: `XPrivacy/XRuntime:S Xposed:S`
+* Fixed: Silenced some spammy XPrivacy items using `XPrivacy/XRuntime:S Xposed:S`
 
 ---
 
@@ -88,7 +137,7 @@
 
 #### 24.06.2015 - WIP-Internal v0.1.30-alpha-build-04
 
-* Added: Toasts are now being cancelled on new toast to prevent overapping of toasts
+* Added: Toasts are now being cancelled on new toast to prevent overlapping of toasts
 
 ---
 

CONTRIBUTING.md

@@ -25,6 +25,7 @@ Let our app start up in your native language!
 
 * See [our translations](https://hosted.weblate.org/projects/aimsicd/strings/) and login via [GitHub](https://hosted.weblate.org/accounts/login/github/?next=/projects/aimsicd/strings/) or [others](https://hosted.weblate.org/accounts/login/?next=/projects/aimsicd/strings/) to add yours.
 * When translating, keep small device screens in mind. Shorten it.
+* Please make sure to finish all translations as best as possible.
 * Translations will be pulled into our GitHub automatically. Enjoy!
 
 ---

app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.SecUpwN.AIMSICD"
-          android:versionCode="31"
-          android:versionName="0.1.31-alpha-b00">
+          android:versionCode="32"
+          android:versionName="0.1.32-alpha-b00">
 
     <!-- If we ever wanna make this a system app, we can add the following 2 lines above:
           coreApp="true"

app/src/main/assets/CREDITS

@@ -227,4 +227,9 @@ Daniel Jäger\n
 https://github.com/DJaeger\n
 for your unbelievable endurance\n
 and all the lovely coding. THANK YOU!\n
-\n
\ No newline at end of file
+\n
+The Changelog\n
+https://changelog.com/\n
+for their podcast and tweet about us!\n
+(SPECIAL THANKS to Jerod)
+\n

app/src/main/assets/det_strings.json

@@ -4,7 +4,7 @@
 "detection_type":"TYPE0"},
 
 {"detection_string":"Received voice mail indicator clear SMS shouldStore=false",
-"detection_type":"SILENTVOICE"},
+"detection_type":"MWI"},
 
 {"detection_string":"SMS TP-PID:0 data coding scheme: 24",
 "detection_type":"FLASH"},

app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java

@@ -371,6 +371,15 @@ public class AIMSICD extends BaseActivity implements AsyncResponse {
             Intent i = new Intent(this, DebugLogs.class);
             startActivity(i);
         } else if (selectedItem.getId() == DrawerMenu.ID.APPLICATION.QUIT) {
+            try {
+                if(mAimsicdService.isSmsTracking()) {
+                    mAimsicdService.stopSmsTracking();
+                }
+            }catch (Exception ee) {
+                System.out.println("Error: Stopping SMS detection");
+            }
+
+            if (mAimsicdService != null) mAimsicdService.onDestroy();
             finish();
         }
 
@@ -566,7 +575,7 @@ public class AIMSICD extends BaseActivity implements AsyncResponse {
                 if(mAimsicdService.isSmsTracking()) {
                     mAimsicdService.stopSmsTracking();
                 }
-            }catch (Exception ee){System.out.println("Error Stopping sms detection");}
+            }catch (Exception ee){System.out.println("Error: Stopping SMS detection");}
             finish();
         }
     }
@@ -578,12 +587,12 @@ public class AIMSICD extends BaseActivity implements AsyncResponse {
 
         if(root_sms && !mAimsicdService.isSmsTracking()){
             mAimsicdService.startSmsTracking();
-            Helpers.msgShort(mContext,"Sms Detection Started");
-            Log.i(TAG,"Sms Detection Thread Started");
+            Helpers.msgShort(mContext,"SMS Detection Started");
+            Log.i(TAG,"SMS Detection Thread Started");
         }else if(!root_sms && mAimsicdService.isSmsTracking()) {
             mAimsicdService.stopSmsTracking();
             Helpers.msgShort(mContext, "Sms Detection Stopped");
-            Log.i(TAG, "Sms Detection Thread Stopped");
+            Log.i(TAG, "SMS Detection Thread Stopped");
         }
 
     }

app/src/main/java/com/SecUpwN/AIMSICD/activities/CustomPopUp.java

@@ -117,14 +117,14 @@ public class CustomPopUp extends Activity {
 
             case 7:
                 MiscUtils.showNotification(getApplicationContext(),
-                        getResources().getString(R.string.alert_silent_voice_sms_detected),
-                        getResources().getString(R.string.app_name_short)+" - "+getResources().getString(R.string.typevoice_header),
+                        getResources().getString(R.string.alert_mwi_detected),
+                        getResources().getString(R.string.app_name_short)+" - "+getResources().getString(R.string.typemwi_header),
                         R.drawable.sense_danger,true);
 
                 createPopUp(
-                        getResources().getString(R.string.typevoice_title),
-                        getResources().getString(R.string.typevoice_header),
-                        getResources().getString(R.string.typevoice_data)
+                        getResources().getString(R.string.typemwi_title),
+                        getResources().getString(R.string.typemwi_header),
+                        getResources().getString(R.string.typemwi_data)
                         ,getResources().getDrawable(R.drawable.sense_danger));
                 break;
 
@@ -135,7 +135,7 @@ public class CustomPopUp extends Activity {
                         R.drawable.sense_danger,true);
 
                 createPopUp(
-                        getResources().getString(R.string.typevoice_title),
+                        getResources().getString(R.string.typemwi_title),
                         getResources().getString(R.string.typewap_header),
                         getResources().getString(R.string.typewap_data)
                         ,getResources().getDrawable(R.drawable.sense_danger));

app/src/main/java/com/SecUpwN/AIMSICD/activities/DebugLogs.java

@@ -212,8 +212,8 @@ public class DebugLogs extends BaseActivity {
                     // show a share intent
                     Intent intent = new Intent(Intent.ACTION_SEND);
                     intent.setType("text/html");
-                    // This is a masked email to one of our developers. In case of spam re-mask.
-                    intent.putExtra(Intent.EXTRA_EMAIL, new String[]{"SecUpwN[-AT-]protonmail.ch"});
+                    // E-Mail address will ONLY be handed out when a DEVELOPER asked for the logs!
+                    intent.putExtra(Intent.EXTRA_EMAIL, new String[]{"See GitHub Issues first!"});
                     intent.putExtra(Intent.EXTRA_SUBJECT, "AIMSICD Error Log");
                     intent.putExtra(Intent.EXTRA_TEXT, log);
                     startActivity(Intent.createChooser(intent, "Send Error Log"));

app/src/main/java/com/SecUpwN/AIMSICD/activities/MapViewerOsmDroid.java

@@ -44,11 +44,6 @@ import com.SecUpwN.AIMSICD.utils.Helpers;
 import com.SecUpwN.AIMSICD.utils.RequestTask;
 import com.SecUpwN.AIMSICD.utils.TinyDB;
 
-import org.osmdroid.api.IProjection;
-import org.osmdroid.events.DelayedMapListener;
-import org.osmdroid.events.MapListener;
-import org.osmdroid.events.ScrollEvent;
-import org.osmdroid.events.ZoomEvent;
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
@@ -104,7 +99,6 @@ public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenc
     private boolean mBound;
 
     private GeoPoint loc = null;
-    private AsyncTask<Void,Void,GeoPoint> mLoadTask = null;
 
     private MyLocationNewOverlay mMyLocationOverlay;
     private CompassOverlay mCompassOverlay;
@@ -115,28 +109,15 @@ public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenc
     private PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
         @Override
         public void onServiceStateChanged(ServiceState serviceState) {
-            loadEntries(true);
+            loadEntries();
         }
 
         @Override
         public void onCellInfoChanged(List<CellInfo> cellInfo) {
-            loadEntries(true);
+            loadEntries();
         }
     };
 
-    private MapListener mMapListener = new DelayedMapListener(new MapListener() {
-        public boolean onScroll(ScrollEvent event) {
-            loadEntries(false);
-            return true;
-        }
-
-        public boolean onZoom(ZoomEvent event) {
-            // TODO: no need to update when zooming in
-            loadEntries(false);
-            return true;
-        }
-    }, 250);
-
     /**
      * Called when the activity is first created.
      */
@@ -158,8 +139,6 @@ public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenc
         TelephonyManager tm = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
         tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CELL_LOCATION |
                 PhoneStateListener.LISTEN_DATA_CONNECTION_STATE);
-
-        mMap.setMapListener(mMapListener);
     }
 
     @Override
@@ -181,7 +160,7 @@ public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenc
         }
 
         loadPreferences();
-        loadEntries(true);
+        loadEntries();
 
         if (mCompassOverlay != null) {
             mCompassOverlay.enableCompass();
@@ -225,7 +204,7 @@ public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenc
     private final BroadcastReceiver mMessageReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            loadEntries(true);
+            loadEntries();
             if(BuildConfig.DEBUG && mCellTowerGridMarkerClusterer != null && mCellTowerGridMarkerClusterer.getItems() != null) {
                 Log.v(TAG, "mMessageReceiver CellTowerMarkers.invalidate() markers.size():" + mCellTowerGridMarkerClusterer.getItems().size());
             }
@@ -402,14 +381,11 @@ public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenc
      *  Description:    Loads Signal Strength Database details to plot on the map,
      *                  only entries which have a location (lon, lat) are used.
      *
+     *
      */
-    private void loadEntries(final boolean updateLocation) {
-        // it doesn't make sense to have multiple tasks running
-        if (mLoadTask != null && mLoadTask.getStatus() != AsyncTask.Status.FINISHED) {
-          mLoadTask.cancel(true);
-        }
+    private void loadEntries() {
 
-        mLoadTask = new AsyncTask<Void,Void,GeoPoint>() {
+        new AsyncTask<Void,Void,GeoPoint>() {
             @Override
             protected GeoPoint doInBackground(Void... voids) {
                 final int SIGNAL_SIZE_RATIO = 15;  // A scale factor to draw BTS Signal circles
@@ -430,7 +406,6 @@ public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenc
                 }
                 if (c != null && c.moveToFirst()) {
                     do {
-                        if (isCancelled()) return null;
                         // The indexing here is that of the Cursor and not the DB table itself
                         final int cellID = c.getInt(0);  // CID
                         final int lac = c.getInt(1);     // LAC
@@ -469,6 +444,8 @@ public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenc
                             ovm.setIcon(getResources().getDrawable(R.drawable.ic_map_pin_blue));
 
                             items.add(ovm);
+
+
                         }
 
                     } while (c.moveToNext());
@@ -497,13 +474,9 @@ public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenc
                 mDbHelper.close();
 
                 // plot neighbouring cells
-                while (mAimsicdService == null) try {
-                  if (isCancelled()) return null;
-                  Thread.sleep(100);
-                } catch (Exception e) {}
+                while (mAimsicdService == null) try { Thread.sleep(100); } catch (Exception e) {}
                 List<Cell> nc = mAimsicdService.getCellTracker().updateNeighbouringCells();
                 for (Cell cell : nc) {
-                    if (isCancelled()) return null;
                     try {
                         loc = new GeoPoint(cell.getLat(), cell.getLon());
                         CellTowerMarker ovm = new CellTowerMarker(mContext,mMap,
@@ -531,59 +504,6 @@ public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenc
                 return ret;
             }
 
-            // TODO: Consider changing this function name to:  <something else>
-            private void loadOpenCellIDMarkers() {
-                // Check if OpenCellID data exists and if so load this now
-                LinkedList<CellTowerMarker> items = new LinkedList<>();
-
-                // DBe_import tower pins.
-                Drawable cellTowerMarkerIcon = getResources().getDrawable(R.drawable.ic_map_pin_green);
-
-                mDbHelper.open();
-                IProjection p = mMap.getProjection();
-                Cursor c = mDbHelper.getOpenCellIDDataByRegion(
-                    p.getSouthWest().getLatitude(), p.getSouthWest().getLongitude(),
-                    p.getNorthEast().getLatitude(), p.getNorthEast().getLongitude()
-                 );
-                if (c.moveToFirst()) {
-                    if (isCancelled()) return;
-                    do {
-                        // The indexing here is that of the Cursor and not the DB table itself:
-                        // CellID,Lac,Mcc,Mnc,Lat,Lng,AvgSigStr,Samples
-                        final int cellID = c.getInt(0);
-                        final int lac = c.getInt(1);
-                        final int mcc = c.getInt(2);
-                        final int mnc = c.getInt(3);
-                        final double dlat = Double.parseDouble(c.getString(4));
-                        final double dlng = Double.parseDouble(c.getString(5));
-                        final GeoPoint location = new GeoPoint(dlat, dlng);
-                        //
-                        final int samples = c.getInt(7);
-
-                        // Add map marker for CellID
-                        CellTowerMarker ovm = new CellTowerMarker(mContext, mMap,
-                                "Cell ID: " + cellID,
-                                "", location,
-                                new MarkerData(
-                                        "" + cellID,
-                                        "" + location.getLatitude(),
-                                        "" + location.getLongitude(),
-                                        "" + lac,
-                                        "" + mcc,
-                                        "" + mnc,
-                                        "" + samples,
-                                        false));
-
-                        ovm.setIcon(cellTowerMarkerIcon);
-                        items.add(ovm);
-                    } while (c.moveToNext());
-                }
-                c.close();
-                mDbHelper.close();
-
-                mCellTowerGridMarkerClusterer.addAll(items);
-            }
-
             /**
              *  TODO:  We need a manual way to add our own location in case:
              *          a) GPS is jammed or not working
@@ -594,27 +514,25 @@ public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenc
              */
             @Override
             protected void onPostExecute(GeoPoint defaultLoc) {
-                if (updateLocation) {
-                    if (loc != null && (loc.getLatitude() != 0.0 && loc.getLongitude() != 0.0)) {
-                        mMap.getController().setZoom(16);
-                        mMap.getController().animateTo(new GeoPoint(loc.getLatitude(), loc.getLongitude()));
-                    } else {
-                        if (mBound) {
-                            // Try and find last known location and zoom there
-                            GeoLocation lastLoc = mAimsicdService.lastKnownLocation();
-                            if (lastLoc != null) {
-                                loc = new GeoPoint(lastLoc.getLatitudeInDegrees(),
-                                        lastLoc.getLongitudeInDegrees());
-
-                                mMap.getController().setZoom(16);
-                                mMap.getController().animateTo(new GeoPoint(loc.getLatitude(), loc.getLongitude()));
-                            } else {
-                                //Use MCC to move camera to an approximate location near Countries Capital
-                                loc = defaultLoc;
-
-                                mMap.getController().setZoom(12);
-                                mMap.getController().animateTo(new GeoPoint(loc.getLatitude(), loc.getLongitude()));
-                            }
+                if (loc != null && (loc.getLatitude() != 0.0 && loc.getLongitude() != 0.0)) {
+                    mMap.getController().setZoom(16);
+                    mMap.getController().animateTo(new GeoPoint(loc.getLatitude(), loc.getLongitude()));
+                } else {
+                    if (mBound) {
+                        // Try and find last known location and zoom there
+                        GeoLocation lastLoc = mAimsicdService.lastKnownLocation();
+                        if (lastLoc != null) {
+                            loc = new GeoPoint(lastLoc.getLatitudeInDegrees(),
+                                    lastLoc.getLongitudeInDegrees());
+
+                            mMap.getController().setZoom(16);
+                            mMap.getController().animateTo(new GeoPoint(loc.getLatitude(), loc.getLongitude()));
+                        } else {
+                            //Use MCC to move camera to an approximate location near Countries Capital
+                            loc = defaultLoc;
+
+                            mMap.getController().setZoom(12);
+                            mMap.getController().animateTo(new GeoPoint(loc.getLatitude(), loc.getLongitude()));
                         }
                     }
                 }
@@ -626,8 +544,55 @@ public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenc
                     mCellTowerGridMarkerClusterer.invalidate();
                 }
             }
-        };
-        mLoadTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }
+
+    // TODO: Consider changing this function name to:  <something else>
+    private void loadOpenCellIDMarkers() {
+        // Check if OpenCellID data exists and if so load this now
+        LinkedList<CellTowerMarker> items = new LinkedList<>();
+
+        // DBe_import tower pins.
+        Drawable cellTowerMarkerIcon = getResources().getDrawable(R.drawable.ic_map_pin_green);
+
+        mDbHelper.open();
+        Cursor c = mDbHelper.getOpenCellIDData();
+        if (c.moveToFirst()) {
+            do {
+                // The indexing here is that of the Cursor and not the DB table itself:
+                // CellID,Lac,Mcc,Mnc,Lat,Lng,AvgSigStr,Samples
+                final int cellID = c.getInt(0);
+                final int lac = c.getInt(1);
+                final int mcc = c.getInt(2);
+                final int mnc = c.getInt(3);
+                final double dlat = Double.parseDouble(c.getString(4));
+                final double dlng = Double.parseDouble(c.getString(5));
+                final GeoPoint location = new GeoPoint(dlat, dlng);
+                //
+                final int samples = c.getInt(7);
+
+                // Add map marker for CellID
+                CellTowerMarker ovm = new CellTowerMarker(mContext, mMap,
+                        "Cell ID: " + cellID,
+                        "", location,
+                        new MarkerData(
+                                "" + cellID,
+                                "" + location.getLatitude(),
+                                "" + location.getLongitude(),
+                                "" + lac,
+                                "" + mcc,
+                                "" + mnc,
+                                "" + samples,
+                                false));
+
+                ovm.setIcon(cellTowerMarkerIcon);
+                items.add(ovm);
+            } while (c.moveToNext());
+        }
+        c.close();
+        mDbHelper.close();
+
+        mCellTowerGridMarkerClusterer.addAll(items);
     }
 
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {

app/src/main/java/com/SecUpwN/AIMSICD/adapters/AIMSICDDbAdapter.java

@@ -112,7 +112,6 @@ public class AIMSICDDbAdapter {
     private final String LOCATION_TABLE     = "locationinfo";    // TABLE_DBI_MEASURE:DBi_measure (volatile)
     private final String CELL_TABLE         = "cellinfo";        // TABLE_DBI_BTS:DBi_bts (physical)
     private final String OPENCELLID_TABLE   = "opencellid";      // TABLE_DBE_IMPORT:DBe_import
-    private final String OPENCELLID_VIEW    = "opencellid_view"; // OCID local + lacells (volatile)
     private final String TABLE_DEFAULT_MCC  = "defaultlocation"; // TABLE_DEFAULT_MCC:defaultlocation
     private final String SILENT_SMS_TABLE   = "silentsms";       // TABLE_SILENT_SMS:silentsms
 
@@ -133,10 +132,6 @@ public class AIMSICDDbAdapter {
     // private final String TABLE_SILENTSMS   = "silentsms";        // Silent SMS details
     // private final String TABLE_CMEASURES   = "CounterMeasures";  // Counter Measures thresholds and description
 
-    private final String LACELLS_DB_NAME  = "/sdcard/.nogapps/lacells.db";
-    private final String LACELLS_LOCAL_DB = "lacells";
-    private final String LACELLS_TABLE    = "cells";
-
     private final String[] mTables;
     private final DbHelper mDbHelper;
     private SQLiteDatabase mDb;
@@ -585,23 +580,13 @@ public class AIMSICDDbAdapter {
      *
      */
     public Cursor getOpenCellIDData() {
-        return mDb.query( OPENCELLID_VIEW,
+        return mDb.query( OPENCELLID_TABLE,
                 new String[]{"CellID", "Lac", "Mcc", "Mnc", "Lat", "Lng", "AvgSigStr", "Samples"},
                 // avg_range, rej_cause, Type
                 null, null, null, null, null
         );
     }
 
-    public Cursor getOpenCellIDDataByRegion(Double lat1, Double lng1, Double lat2, Double lng2) {
-        return mDb.query( OPENCELLID_VIEW,
-                new String[]{"CellID", "Lac", "Mcc", "Mnc", "Lat", "Lng", "AvgSigStr", "Samples"},
-                // avg_range, rej_cause, Type
-                "? <= Lng AND Lng <= ? AND ? <= Lat AND Lat <= ?",
-                new String[]{lng1.toString(), lng2.toString(), lat1.toString(), lat2.toString()},
-                null, null, null
-        );
-    }
-
     /**
      * Returns Default MCC Locations (defaultlocation) database contents
      */
@@ -647,10 +632,10 @@ public class AIMSICDDbAdapter {
 
     /**
      *  Description:    This checks if a cell with a given CID already exists
-     *                  in the "opencellid" (DBe_import) or optional lacells database.
+     *                  in the "opencellid" (DBe_import) database.
      */
     public boolean openCellExists(int cellID) {
-        Cursor cursor = mDb.rawQuery("SELECT * FROM " + OPENCELLID_VIEW +
+        Cursor cursor = mDb.rawQuery("SELECT * FROM " + OPENCELLID_TABLE +
                         " WHERE CellID = " + cellID, null);
         boolean exists = cursor.getCount() > 0;
         //Log.v(TAG, mTAG + ": Does CID: " + cellID + " exist in DBe_import? " + exists);
@@ -1384,16 +1369,13 @@ public class AIMSICDDbAdapter {
      *
      *  Description:    This class creates all the tables and DB structure in aimsicd.db when
      *                  AIMSICD is first started or updated when DB version changed.
-     *                  Also creates a view that merges lacells.db with local OCID.
      *
      *  Issues:
      *              [ ] Migrate table creation to use an SQL file import instead.
      *                  This will simplify the maintenance of the tables and the
      *                  create create process.
      *
-     *              [ ] Avoid duplicates when cell is in both local and lacells tables
-     *
-     *              [ ] DRY checkDBe() and DbHelper.onConfigure() filter
+     *              [ ]
      *
      *  ChangeLog:
      *
@@ -1404,47 +1386,6 @@ public class AIMSICDDbAdapter {
             super(context, DB_NAME, null, DATABASE_VERSION);
         }
 
-        // Create a view merging local OCID and lacells.db database rows.
-        @Override
-        public void onOpen(SQLiteDatabase db) {
-            String CreateView = "CREATE TEMP VIEW " +
-                    OPENCELLID_VIEW + " AS" +
-                    " SELECT CellID, Lac, Mcc, Mnc, Lat, Lng, AvgSigStr, Samples" +
-                    " FROM " + OPENCELLID_TABLE;
-
-            File lacells = new File(LACELLS_DB_NAME);
-            if (lacells.isFile() && lacells.canRead()) {
-                // Make sure it has a location index. Separate connection to avoid locking issues.
-                // TODO this can take a while the first time, provide UI feedback
-                SQLiteDatabase ladb = SQLiteDatabase.openDatabase(LACELLS_DB_NAME, null, 0);
-                String LACELLS_TABLE_CREATE = "CREATE TABLE IF NOT EXISTS " +
-                        LACELLS_TABLE  + " (" + COLUMN_ID +
-                        " INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                        "Lac INTEGER, CellID INTEGER, " +
-                        "Net VARCHAR, " +
-                        "Lat VARCHAR, " +
-                        "Lng VARCHAR, " +
-                        "Signal INTEGER, " +
-                        "Connection VARCHAR, " +
-                        "Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP);";
-                ladb.execSQL(LACELLS_TABLE_CREATE);
-                ladb.execSQL("CREATE INDEX IF NOT EXISTS _idxspatial ON " + LACELLS_TABLE + " (Lat, Lng);");
-                ladb.close();
-                // Attach to existing connection for cross-database join
-                db.execSQL("ATTACH DATABASE \"" + LACELLS_DB_NAME + "\" AS " + LACELLS_LOCAL_DB);
-                // signal strength is (usually) not present in lacells
-                CreateView += " UNION ALL" +
-                    " SELECT cid AS CellID, lac AS Lac, mcc AS Mcc, mnc AS Mnc," +
-                        " latitude AS Lat, longitude AS Lng, NULL AS AvgSigStr, samples AS Samples" +
-                    " FROM " + LACELLS_LOCAL_DB + "." + LACELLS_TABLE +
-                    " WHERE Samples >= 1 AND Lac >= 1 AND Lac <= 65535" +
-                    " AND CellID >= 1 AND CellID <= 268435455 ";
-                    //" GROUP BY CellID, Lac, Mcc, Mnc"; // much too slow
-            }
-
-            db.execSQL(CreateView);
-        }
-
         // Create aimsicd.db table structure 
         @Override
         public void onCreate(SQLiteDatabase database) {
@@ -1637,7 +1578,6 @@ public class AIMSICDDbAdapter {
                     //"Timestamp TIMESTAMP NOT NULL DEFAULT current_timestamp, " +
                     ");";
             database.execSQL(OPENCELLID_DATABASE_CREATE);
-            database.execSQL("CREATE INDEX OpenCellID_spatial ON " + OPENCELLID_TABLE + " (Lat, Lng);");
         }
 
         /**

app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/SmsDetectionDbAccess.java

@@ -49,7 +49,7 @@ public class SmsDetectionDbAccess {
     /*
         When inserting strings it has to be in the format
         i am a type 0 string  <-----your string can be found in locat
-        TYPE0 SILENTVOICE FLASH <--- These have to be in CAPS
+        TYPE0 MWI FLASH <--- These have to be in CAPS
         ContentValues newconvalues = new ContentValues();
         newconvalues.put(SILENT_SMS_STRING_COLUMN, "your string goes here");
         newconvalues.put(SILENT_SMS_TYPE_COLUMN, "TYPE0");

app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/SmsDetectionDbHelper.java

@@ -101,7 +101,7 @@ public class SmsDetectionDbHelper extends SQLiteOpenHelper {
         //Preparing strings for database here
         String SILENT_ONLY_TAGS[] = {
                 "Received short message type 0, Don't display or store it. Send Ack#TYPE0",//Type0 Samsung
-                "Received voice mail indicator clear SMS shouldStore=false#SILENTVOICE",//this msg is in a few phones
+                "Received voice mail indicator clear SMS shouldStore=false#MWI",//this msg is in a few phones
                 "SMS TP-PID:0 data coding scheme: 24#FLASH",//Flash
                 "isTypeZero=true#TYPE0",
                 "incoming msg. Mti 0 ProtocolID 0 DCS 0x04 class -1#WAPPUSH"

app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/SmsDetector.java

@@ -38,10 +38,11 @@ import java.util.ArrayList;
  *
  *    TODO if you feel like this class needs improvement feel free to make a PR.
  *
- *    TODO @SecUpwn make a list of phones that this method works on with feedback from users.
+ *    For latest list of working phones/models, please see:
+ *    https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/issues/532
  *
- *    PHONE:Samsung S5      MODEL:SM-G900F      ANDROID_VER:4.4.2   TYPE0:YES SILENTVOICE:YES
- *    PHONE:Sony Xperia J   MODEL:ST260i        ANDROID_VER:4.1.2   TYPE0:NO  SILENTVOICE:YES
+ *    PHONE:Samsung S5      MODEL:SM-G900F      ANDROID_VER:4.4.2   TYPE0:YES MWI:YES
+ *    PHONE:Sony Xperia J   MODEL:ST260i        ANDROID_VER:4.1.2   TYPE0:NO  MWI:YES
  *
  */
 public class SmsDetector extends Thread {
@@ -117,7 +118,7 @@ public class SmsDetector extends Thread {
                 e.printStackTrace();
             }
             try {
-                String MODE = "logcat -v time -b radio\n";// default
+                String MODE = "logcat -v time -b radio -b main\n";// default
                 Runtime r = Runtime.getRuntime();
                 Process process = r.exec("su");
                 dos = new DataOutputStream(process.getOutputStream());
@@ -227,7 +228,7 @@ public class SmsDetector extends Thread {
                             setmsg.setCurrent_cid(mAimsicdService.getCellTracker().getMonitorCell().getCID());
                             setmsg.setCurrent_nettype(Device.getNetworkTypeName(mAimsicdService.getCell().getNetType()));
                             setmsg.setCurrent_roam_status(mAimsicdService.getCellTracker().getDevice().isRoaming());
-                            //TODO is this the right place to get upto date geo location?
+                            // TODO Is this the right place to get up-to-date geo-location?
                             setmsg.setCurrent_gps_lat(mAimsicdService.lastKnownLocation().getLatitudeInDegrees());
                             setmsg.setCurrent_gps_lon(mAimsicdService.lastKnownLocation().getLongitudeInDegrees());
 
@@ -241,7 +242,7 @@ public class SmsDetector extends Thread {
 
                         //SILENT_ONLY_TAGS[arrayindex].split("#")[0] <-- index 0 is the detection string
                         //SILENT_ONLY_TAGS[arrayindex].split("#")[1] <-- index 1 is the sms TYPE WAPPUSH TYPE0 ETC...
-                        }else if(SILENT_ONLY_TAGS[arrayindex].split("#")[1].trim().equals("SILENTVOICE")){
+                        }else if(SILENT_ONLY_TAGS[arrayindex].split("#")[1].trim().equals("MWI")){
                             Log.i(TAG, "SILENT DETECTED");
                             CapturedSmsData setmsg = new CapturedSmsData();
                             setmsg.setSenderNumber("unknown");//default
@@ -276,12 +277,12 @@ public class SmsDetector extends Thread {
                             }
 
                             setmsg.setSmsTimestamp(logcat_timestamp);
-                            setmsg.setSmsType("SILENTVOICE");
+                            setmsg.setSmsType("MWI");
                             setmsg.setCurrent_lac(mAimsicdService.getCellTracker().getMonitorCell().getLAC());
                             setmsg.setCurrent_cid(mAimsicdService.getCellTracker().getMonitorCell().getCID());
                             setmsg.setCurrent_nettype(Device.getNetworkTypeName(mAimsicdService.getCell().getNetType()));
                             setmsg.setCurrent_roam_status(mAimsicdService.getCellTracker().getDevice().isRoaming());
-                            //TODO is this the right place to get upto date geo location?
+                            // TODO Is this the right place to get up-to-date geo-location?
                             setmsg.setCurrent_gps_lat(mAimsicdService.lastKnownLocation().getLatitudeInDegrees());
                             setmsg.setCurrent_gps_lon(mAimsicdService.lastKnownLocation().getLongitudeInDegrees());
 

app/src/main/res/values-cs/translatable_strings.xml

+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="tracking">Sledování</string>
+    <string name="device_info">Podrobnosti telefonu/SIM</string>
+    <string name="db_viewer">Prohlížení databáze</string>
+    <string name="map_view">Prohlížení mapy antén</string>
+    <string name="quit">Ukončit</string>
+    <string name="text_ok">OK</string>
+    <string name="text_cancel">Zrušit</string>
+    <string name="text_agree">Souhlasím</string>
+    <string name="text_disagree">Nesouhlasím</string>
+
+    <string name="disclaimer_title">VAROVÁNÍ</string>
+    <string name="toggle_attack_detection">Zjišťovat útoky</string>
+    <string name="toggle_cell_tracking">Sledovat buňky</string>
+    <string name="backup_database">Záloha databáze</string>
+    <string name="restore_database">Obnova databáze</string>
+    <string name="preferences">Nastavení</string>
+    <string name="send_logs">Ladění</string>
+    <string name="get_opencellid">Stáhnout data BTS</string>
+
+    <string name="device_info_title">Informace o zařízení</string>
+    <string name="sim_info_title">Informace o SIM</string>
+    <string name="network_info">Informace o síti</string>
+    <string name="neighbouring_cells_num_title">Celkem:</string>
+    <string name="sim_country">Země:</string>
+    <string name="sim_operator_id">ID operátora:</string>
+    <string name="sim_operator_name">Název operátora:</string>
+    <string name="sim_imsi">IMSI:</string>
+    <string name="device_type">Typ telefonu:</string>
+    <string name="device_imei">IMEI:</string>
+    <string name="device_version"/>
+    <string name="network_name">Název poskytovatele:</string>
+    <string name="network_code">ID poskytovatele:</string>
+    <string name="network_type">Typ:</string>
+    <string name="network_lac">LAC:</string>
+    <string name="network_cellid">CID:</string>
+    <string name="app_version">Verze:</string>
+    <string name="download_error">Chyba při stahování:</string>
+    <string name="status">Stav:</string>
+    </resources>

app/src/main/res/values-de/translatable_strings.xml

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
     
     <!-- Drawer -->
@@ -57,7 +57,7 @@
     <string name="sim_serial">Seriennummer:</string>
     <string name="device_type">Telefonart:</string>
     <string name="device_imei">IMEI:</string>
-    <string name="device_version">RIL Version:</string>
+    <string name="device_version">RIL-Version:</string>
     <string name="network_name">Versorger:</string>
     <string name="network_code">Versorger-Code:</string>
     <string name="network_type">Netzart:</string>
@@ -77,7 +77,7 @@
     
     <!-- ABOUT LAYOUT -->
     <string name="about_aimsicd">Über AIMSICD</string>
-    <string name="app_version">Version:&#160;</string>
+    <string name="app_version">Version: </string>
     <string name="aimsicd_about_info3">Android-basiertes Projekt zur Erkennung und Vermeidung gefälschter Mobilfunkstationen\n(IMSI-Catcher) in GSM/UMTS-Netzwerken.</string>
     <string name="about_github">AIMSICD auf GitHub</string>
     <string name="about_wiki">Dokumentation (WIKI)</string>
@@ -143,8 +143,8 @@
     <string name="pc_label">PC: </string>
     <string name="samples_label">Proben: </string>
     <string name="open_cell_id_label">OpenCellID-Daten</string>
-    <string name="lat_label">Lat: </string>
-    <string name="lng_label">Lon: </string>
+    <string name="lat_label">"Lat: "</string>
+    <string name="lng_label">"Lon: "</string>
     
     <!-- Database Viewer -->
     <string name="table_names_prompt">Tabelle auswählen</string>
@@ -160,7 +160,7 @@
     <string name="database_export_successful">Export erfolgreich</string>
     
     <!-- AT Command Interface  -->
-    <string name="at_command_title">AT Command Interface</string>
+    <string name="at_command_title">AT-Befehlskonsole</string>
     <string name="response_label">Reaktion:</string>
     <string name="execute_at">Ausführen</string>
     <string name="serial_device_title">Derzeitige Schnittstelle:</string>
@@ -172,7 +172,7 @@
    
     <!-- SILENT SMS FRAGMENT -->
     <string name="sms_title">Stille SMS erkannt</string>
-    <string name="sms_message">Eine stille SMS wurde erkannt!\n\Details: Siehe Datenbankbetrachter.</string>
+    <string name="sms_message">Stille SMS wurde erkannt!\nDetails: Siehe Datenbankbetrachter.</string>
     <string name="table_contains_no_data">Tabelle beinhaltet keine Daten.</string>
   
     <!-- Request OpenCellID Key -->
@@ -239,15 +239,15 @@
     <string name="status_good">Status: Gut. Keine Gefahren erkannt.</string>
     <string name="alert_threat_detected">ALARM: Eine Gefahr wurde erkannt!</string>
     <string name="alert_femtocell_connection_detected">ALARM: Verbinding mit Femtozelle erkannt!</string>
-    <string name="alert_silent_sms_detected">ALARM: Stille SMS (Type-0) erkannt!</string>
+    <string name="alert_silent_sms_detected">ALARM: Stille SMS erkannt!</string>
     <string name="femtocell_only_on_cdma_devices">AIMSICD kann Verbindungen mit Femtozellen derzeit nur auf CDMA-Geräten erkennen.</string>
     <string name="service_state_changed">Betriebsstatus verändert!</string>
     <string name="stopped_tracking_femtocell">: Femtozellerkennung angehalten.</string>
     <string name="alert_femtocell_tracking_detected">ALARM: Femtozellverfolgung erkannt!</string>
     <string name="refreshing_every">Aktualisiere aller</string>
-    <string name="refreshing_now">Aktualisiere jetzt&#8230;</string>
+    <string name="refreshing_now">Aktualisiere jetzt…</string>
     <string name="seconds">Sekunden.</string>
-    <string name="contacting_opencellid_for_data">Kontaktiere OpenCellID für Daten&#8230;\nDies kann eine Minute dauern.</string>
+    <string name="contacting_opencellid_for_data">Kontaktiere OpenCellID für Daten…\nDies kann eine Minute dauern.</string>
     <string name="unable_to_determine_last_location">Konnte letzten Standort nicht ermitteln.\nStandortbasierte Dienste einschalten und erneut versuchen.</string>
     <string name="no_tracked_locations_found">Keine aufgezeichneten Standorte zum Anzeigen gefunden.</string>
     <string name="no_data_for_publishing">Keine Daten zum Veröffentlichen verfügbar.</string>
@@ -267,7 +267,7 @@
     <string name="unable_to_detect_busybox">Busybox konnte nicht erkannt werden.\nAT-Befehle setzen Busybox-Komponenten für korrekte Funktion voraus.\nBitte prüfen ob Busybox installiert ist und erneut versuchen.</string>
     <string name="unknown_error_trying_to_acquire_serial_device">Ein unbekannter Fehler trat beim Zugriffsversuch auf die serielle Schnittstelle auf.\nBitte Fehlerprotokoll prüfen und auf unserem GitHub veröffentlichen.</string>
     <string name="unknown_error_initialising_at_command_injector">Ein unbekannter Fehler trat bei der Initialisierung des AT-Befehlseingabe auf.\nBitte Fehlerprotokoll prüfen und auf unserem GitHub veröffentlichen.</string>
-    <string name="getting_ocid_api_key">Empfange OpenCellID API-Schlüssel&#8230;</string>
+    <string name="getting_ocid_api_key">Empfange OpenCellID API-Schlüssel…</string>
     <string name="unable_to_create_map">Karte konnte nicht erstellt werden!</string>
     <string name="describe_the_problem_you_had">ACHTUNG! Bitte das Problem vor dem versenden der Daten beschreiben. KEINE HILFE OHNE BESCHREIBUNG!\n</string>
     <string name="status">Status:</string>
@@ -284,7 +284,7 @@
     <!-- Advanced User Settings: Delete Detected SMS-->
     <string name="adv_user_sms_info">Dieses Menü ist nur für fortgeschrittene Benutzer!\nZum löschen die SMS in der Liste lang drücken.</string>
     <string name="title_activity_advanced_user">Erkannte SMS löschen</string>
-    <string name="adv_user_pref_header">Advanced User Settings</string>
+    <string name="adv_user_pref_header">Experteneinstellungen</string>
     <string name="adv_user_pref_launch">Erkennungs-Zeichenfolge</string>
     <string name="adv_user_pref_sms_launch">SMS löschen</string>
     <string name="adv_user_pref_summary">Erkennungs-Zeichenfolgen einfügen</string>
@@ -297,11 +297,12 @@
     <!-- Detected SMS string for custom popup-->
     <string name="detection_strings">Erkennungs-Zeichenfolgen</string>
     <string name="typezero_title">ACHTUNG!</string>
-    <string name="typezero_header">Type0 SMS erkannt</string>
-    <string name="typezero_data">Stille SMS Nachricht wurde erkannt!\n\nDetails: Siehe Datenbankbetrachter.\n\nWenn diese Daten durch unsere Entwickler analysiert werden sollen, senden Sie uns bitte das Protokoll über das Menü Fehlerbehebung.</string>
-    <string name="typevoice_title">ACHTUNG!</string>
-    <string name="typevoice_header">Stille Sprachnachricht erkannt</string>
-    <string name="typevoice_data">Stille Sprachnachricht wurde erkannt! \n\nnDetails: Siehe Datenbankbetrachter.\n\nWenn diese Daten durch unsere Entwickler analysiert werden sollen, senden Sie uns bitte das Protokoll über das Menü Fehlerbehebung.</string>
+    <string name="typezero_header">Stille SMS erkannt</string>
+    <string name="typezero_data">Type-0 Nachricht wurde erkannt!\nDetails: Siehe Datenbankbetrachter.</string>
+    <string name="alert_mwi_detected">ALARM: Benachrichtigungsindikator erkannt!</string>
+    <string name="typemwi_title">ACHTUNG!</string>
+    <string name="typemwi_header">MWI Erkannt</string>
+    <string name="typemwi_data">Benachrichtigungsindikator erkannt!\nDetails: Siehe Datenbankbetrachter.</string>
     
     <!-- Section Main-->
     <string name="help_main_current_threat_level">AIMSICD-Gefahrenstatus, Benachbarte Funkzellen und Verschlüsselungsindikator.</string>
@@ -324,13 +325,13 @@
     <string name="help_settings_import_db_from_csv">Datenbanktabellen aus einzelnen CSV-Dateien importieren.</string>
     
     <!-- Section Application-->
-    <string name="help_app_add_get_ocid_api_key">API-Schlüssel für die Nutzung der OpenCellID-Datenbanken sowie hoch- und herunterladen der Daten anfordern&#8230;</string>
+    <string name="help_app_add_get_ocid_api_key">API-Schlüssel für die Nutzung der OpenCellID-Datenbanken sowie hoch- und herunterladen der Daten anfordern…</string>
     <string name="help_app_about">Status-Symbole und Erklärung des Projekts.</string>
     <string name="help_app_download_local_bst">OCID-Datenbank herunterladen.</string>
     <string name="help_app_upload_local_bst">Eigene BTS-Daten zu OCID hochladen.</string>
     <string name="help_app_debugging">Fehlerprotokolle sammeln und versenden.</string>
     <string name="help_app_quit">Diese App verlassen.</string>
-    <string name="waiting_for_location">Standort wird ermittelt&#8230;</string>
+    <string name="waiting_for_location">Standort wird ermittelt…</string>
     <string name="unable_to_restore_backup_from_previous_database_version">Alte Datenbank kann auf Grund struktureller Änderungen nicht wiederhergestellt werden!</string>
     <string name="unique_bts_data">Eindeutige BTS-Daten</string>
     <string name="bts_measurements">BTS-Messungen</string>
@@ -339,8 +340,8 @@
     <string name="silent_sms">Stille SMS</string>
     <string name="eventlog">Ereignisprotokoll</string>
     <string name="measured_signal_strengths">Gemessene Signalstärken</string>
-    <string name="at_command_response_looking">*** Suche AT-Schnittstelle&#8230;\n</string>
-    <string name="at_command_response_found">Gefunden:&#032;</string>
+    <string name="at_command_response_looking">*** Suche AT-Schnittstelle…\n</string>
+    <string name="at_command_response_found">Gefunden: </string>
     <string name="at_command_response_setup_complete">*** Einrichtung vollständig ***\n</string>
     <string name="currently_connected_bts">Derzeit verbundene Funkstation</string>
     <string name="well_known_encrypted_bts">Gut bekannte verschlüsselte Funkstation</string>
@@ -379,4 +380,11 @@
         <item>@string/timeout_spinner_10_min</item>
     </string-array>
 
-</resources>
\ No newline at end of file
+    <string name="alert_silent_wap_sms_detected">ALARM: WAP Push SMS erkannt!</string>
+    <string name="typewap_header">WAP Push Erkannt</string>
+    <string name="typewap_data">WAP Push SMS Nachricht erkannt!\nDetails: Siehe Datenbankbetrachter.</string>
+
+    <string name="invalid_key_try_later">Ungültiger OpenCellID-Schlüssel, bitte später erneut versuchen.</string>
+    <string name="getting_ocid_key">Besorge OpenCellID-Schlüssel...</string>
+    
+    </resources>

app/src/main/res/values-fr/translatable_strings.xml

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 
     <!-- Drawer -->
@@ -76,7 +76,7 @@
 
     <!-- ABOUT LAYOUT -->
     <string name="about_aimsicd">À propos de AIMSICD</string>
-    <string name="app_version">Version:&#160;</string>
+    <string name="app_version">Version: </string>
     <string name="aimsicd_about_info3">Projet Basé sur Android conçu pour détecter et éviter les fausses stations de bases (IMSI-Catchers) sur les réseaux GSM/UMTS.</string>
     <string name="about_github">AIMSICD sur GitHub</string>
     <string name="about_wiki">Documentation (WIKI)</string>
@@ -172,7 +172,7 @@
 
     <!-- SILENT SMS FRAGMENT -->
     <string name="sms_title">SMS Silencieux détecté!</string>
-    <string name="sms_message">SMS Silencieux détecté!\n\nDetails: Voir la base de donnée</string>
+    <string name="sms_message">SMS Silencieux détecté!\nDetails: Voir la base de donnée.</string>
     <string name="table_contains_no_data">La table ne contient aucune donnée.</string>
 
     <!-- Request OpenCellID Key -->
@@ -185,7 +185,7 @@
     <string name="title_debug_logs">Logs de Debugging</string>
     <string name="btn_clear_logs">Effacer</string>
     <string name="btn_copy_to_clipboard">Copier</string>
-    <string name="msg_copied_to_clipboard">Logs copiés dans le presse papier</string>
+    <string name="msg_copied_to_clipboard">Logs copiés dans le presse papier.</string>
     <string name="btn_stop_logs">Arrêter</string>
     <string name="btn_start_logs">Démarrage</string>
 
@@ -239,17 +239,17 @@
     <string name="status_good">Statut: Bon. Aucune Menace Détectée.</string>
     <string name="alert_threat_detected">ALERTE : menace Détectée!</string>
     <string name="alert_femtocell_connection_detected">ALERTE: FemtoCellule Détectée!</string>
-    <string name="alert_silent_sms_detected">ALERTE: SMS Silencieux (Type-0) Détecté!</string>
+    <string name="alert_silent_sms_detected">ALERTE: SMS Silencieux Détecté!</string>
     <string name="alert_silent_wap_sms_detected">ALERTE: SMS Wap Push Détecté!</string>
-    <string name="alert_silent_voice_sms_detected">ALERTE: SMS de contrôle de messagerie vocale (MWI) Détecté!</string>
+    <string name="alert_mwi_detected">ALERT: Message Waiting Indicator detected!</string>
     <string name="femtocell_only_on_cdma_devices">AIMSICD ne peut détecter les connexions FemtoCellules que sur les appareils CDMA.</string>
     <string name="service_state_changed">État du service changé !</string>
     <string name="stopped_tracking_femtocell">: Arrêt du tracking des FemtoCellules.</string>
     <string name="alert_femtocell_tracking_detected">ALERTE: Tracking par FemtoCellule Détecté!</string>
     <string name="refreshing_every">Rafraichir tous les</string>
-    <string name="refreshing_now">Raffaichissement&#8230;</string>
+    <string name="refreshing_now">Raffaichissement…</string>
     <string name="seconds">secondes.</string>
-    <string name="contacting_opencellid_for_data">Contact d\'OpenCellID pour récupérer les données&#8230;\nCela peut prendre jusqu\'à une minute.</string>
+    <string name="contacting_opencellid_for_data">Contact d\'OpenCellID pour récupérer les données…\nCela peut prendre jusqu\'à une minute.</string>
     <string name="unable_to_determine_last_location">Impossible de déterminer votre dernière position.\nActivez les services et réessayez.</string>
     <string name="no_tracked_locations_found">Aucune position à afficher sur la carte.</string>
     <string name="no_data_for_publishing">Aucune donnée à publier.</string>
@@ -268,7 +268,7 @@
     <string name="unable_to_acquire_root_access">Impossible d\'obtenir l\'accès ROOT.\nL\'injection de commandes AT à besoin d\'un accès terminal en tant que ROOT.\nVéréfiez que votre téléphone est rooté et réessayez.</string>
     <string name="unable_to_detect_busybox">Busybox non trouvé.\nL\'injection de commandes AT a besoin de Busybox pour fonctionner correctement.\nVéréfiez que votre appareil possède Busybox et ressayez.</string>
     <string name="unknown_error_trying_to_acquire_serial_device">Une erreur inconnue  est survenu lors de l\'accès au périphérique Série.\nVéréfiez les logs et postez les erreurs sur Github.</string>
-    <string name="getting_ocid_api_key">Obtention d\'une clé de l\'API d\'OpenCellID&#8230;</string>
+    <string name="getting_ocid_api_key">Obtention d\'une clé de l\'API d\'OpenCellID…</string>
     <string name="unable_to_create_map">Impossible de créer la carte!</string>
     <string name="describe_the_problem_you_had">ATTENTION! Veuillez décrire le problème que vous avez (en anglais !), avant de nous envoyer ces logs. PAS D\'AIDE SANS DESCRIPTION PRÉCISE!\n</string>
     <string name="status">Statut:</string>
@@ -299,13 +299,13 @@
     <!-- Detected SMS string for custom popup -->
     <string name="detection_strings">Texte de Détection</string>
     <string name="typezero_title">ATTENTION!</string>
-    <string name="typezero_header">SMS Type-0 Détecté</string>
-    <string name="typezero_data">SMS silencieux (Type-0) Détecté!\n\nDétails: Voir la Base de Données.\n\nSi vous voulez que ce SMS soit analysé par nos développeurs, envoyez les logs à travers le menu de Débugging.</string>
-    <string name="typevoice_title">ATTENTION!</string>
-    <string name="typevoice_header">SMS MWI Détecté</string>
-    <string name="typevoice_data">SMS de contrôle de la messagerie vocale (MWI) Détecté!\n\nDétails: Voir la Base de Données.\n\nSi vous voulez que ce SMS soit analysé par nos développeurs, envoyez les logs à travers le menu de Débugging.</string>
+    <string name="typezero_header">SMS Silencieux Détecté</string>
+    <string name="typezero_data">Message Type-0 Détecté!\nDétails: Voir la Base de Données.</string>
+    <string name="typemwi_title">ATTENTION!</string>
+    <string name="typemwi_header">SMS MWI Détecté</string>
+    <string name="typemwi_data">SMS de contrôle de la messagerie vocale (MWI) Détecté!\nDétails: Voir la Base de Données.</string>
     <string name="typewap_header">SMS Wap Push Détecté</string>
-    <string name="typewap_data">Message SMS Wap Push Détecté!\n\nDétails: Voir la Base de Données.\n\nSi vous voulez que ce SMS soit analysé par nos développeurs, envoyez les logs à travers le menu de Débugging.</string>
+    <string name="typewap_data">Message SMS Wap Push Détecté!\nDétails: Voir la Base de Données.</string>
 
 
     <!-- Section Main-->
@@ -329,13 +329,13 @@
     <string name="help_settings_import_db_from_csv">Importer une table de la Base de Donnée depuis un fichier CSV.</string>
 
     <!-- Section Application-->
-    <string name="help_app_add_get_ocid_api_key">obtenir une clé pour utiliser la base de donnée d\'OpenCellID et pour uploader vos données&#8230;</string>
+    <string name="help_app_add_get_ocid_api_key">obtenir une clé pour utiliser la base de donnée d\'OpenCellID et pour uploader vos données…</string>
     <string name="help_app_about">Explication des icônes de statut et du projet.</string>
     <string name="help_app_download_local_bst">Télécharger la Base de Données OpenCellID.</string>
     <string name="help_app_upload_local_bst">Uploader vos BTS vers OpenCellID.</string>
     <string name="help_app_debugging">Afficher et envoyer les logs d\'application.</string>
     <string name="help_app_quit">Quitter cette application.</string>
-    <string name="waiting_for_location">Recherche de votre localisation en cours&#8230;</string>
+    <string name="waiting_for_location">Recherche de votre localisation en cours…</string>
     <string name="unable_to_restore_backup_from_previous_database_version">Impossible de restaurer la Base de Données : la structure de celle-ci a changé depuis!</string>
     <string name="unique_bts_data">Données BTS Uniques</string>
     <string name="bts_measurements">Données BTS</string>
@@ -345,8 +345,8 @@
     <string name="eventlog">Événements</string>
     <string name="measured_signal_strengths">Puissance des signaux Mesurés</string>
 
-    <string name="at_command_response_looking">*** Recherche de périphériques AT&#8230;\n</string>
-    <string name="at_command_response_found">Trouvé:&#032;</string>
+    <string name="at_command_response_looking">*** Recherche de périphériques AT…\n</string>
+    <string name="at_command_response_found">Trouvé: </string>
     <string name="at_command_response_setup_complete">*** Recherche terminée ***\n</string>
 
     <string name="currently_connected_bts">BTS actuellement connectée à votre Téléphone.</string>
@@ -386,4 +386,4 @@
         <item>@string/timeout_spinner_10_min</item>
     </string-array>
 
-</resources>
\ No newline at end of file
+</resources>

app/src/main/res/values-ja/translatable_strings.xml

+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="tracking">追跡中</string>
+    <string name="device_info">電話/SIM 詳細</string>
+    <string name="map_view">アンテナマップ ビューア</string>
+    <string name="db_viewer">データベース ビューア</string>
+    <string name="quit">終了</string>
+    <string name="text_ok">OK</string>
+    <string name="text_cancel">キャンセル</string>
+    <string name="text_agree">同意する</string>
+    <string name="text_disagree">同意しない</string>
+
+    </resources>

app/src/main/res/values-pl/translatable_strings.xml

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 
     <!-- Drawer -->
@@ -14,14 +14,7 @@
 
     <!-- DISCLAIMER -->
     <string name="disclaimer_title">DISCLAIMER</string>
-    <string name="disclaimer">By using AIMSICD you have understood and agree that AIMSICD is an experimental
-        and informative Android application that can fail to detect surveillance and
-        tracking for many reasons. You also understand that it can be circumvented or
-        defeated by other means, not yet understood to the developers. Thus you also
-        agree and understand that the developers and companies related to this free
-        product, can in no way be held responsible for any results or outcome,
-        depending on the use of this application.
-    </string>
+    <string name="disclaimer">"Używając AIMSICD oświadczasz, że rozumiesz i zgadzasz się z tym, że AIMSICD jest eksperymentalną i informacyjną aplikacją na system Android, która może, z wielu powodów, nie być w stanie wykryć tego, że jesteś nadzorowany czy śledzony. Przyjmujesz także do wiadomości, że program może być pokonany w sposoby jeszcze nie znane deweloperom. Tak więc zgadzasz się i rozumiesz, że deweloperzy i firmy związane z tym darmowym produktem nie mogą być pociągnięte do odpowiedzialności z żadnego powodu niezależnie od wyniku użytkowania tej aplikacji. "</string>
 
 
     <!-- MENU -->
@@ -29,12 +22,12 @@
     <string name="toggle_cell_tracking">Przełącz Śledzenie komórki</string>
     <string name="backup_database">Kopia zapasowa bazy danych</string>
     <string name="clear_database">Wyczyść bazę danych</string>
-    <string name="clear_database_question">All data will be deleted.\nAre you sure?</string>
+    <string name="clear_database_question">Wszystkie dane zostaną skasowane.\nNa pewno?</string>
     <string name="restore_database">Odzyskaj bazę danych</string>
     <string name="preferences">Ustawienia</string>
     <string name="press_once_again_to_exit">Wciśnij ponownie by wyjść.</string>
     <string name="cell_lookup">Wszystkie informacje o obecnej komórce</string>
-    <string name="send_logs">Debugging</string>
+    <string name="send_logs">Debugowanie</string>
     <string name="no_network_connection_title">Brak połączenia z Internetem</string>
     <string name="no_network_connection_message">Nie da się pobrać danych z OpenCellID bez połączenia Internetowego. Proszę włączyć połączenie danych!</string>
 
@@ -76,7 +69,7 @@
 
     <!-- ABOUT LAYOUT -->
     <string name="about_aimsicd">O AIMSICD</string>
-    <string name="app_version">Wersja:&#160;</string>
+    <string name="app_version">Wersja: </string>
     <string name="aimsicd_about_info3">Projekt na Android pozwalający wykrywać fałszywe stacje bazowe (IMSI-catchery) w sieci GSM/UMTS.</string>
     <string name="about_github">AIMSICD na Githubie</string>
     <string name="about_wiki">Dokumentacja (WIKI)</string>
@@ -86,12 +79,12 @@
     <string name="about_changelog">LISTA ZMIAN</string>
     <string name="about_license">LICENCJA</string>
     <string name="about_credits">TWÓRCY</string>
-    <string name="about_desc_icon_idle">Idle / Loading.</string>
-    <string name="about_desc_icon_active_tracking_near">Active tracking close to you!</string>
+    <string name="about_desc_icon_idle">Bezczynność / Ładowanie.</string>
+    <string name="about_desc_icon_active_tracking_near">Aktywne śledzenie blisko Ciebie!</string>
     <string name="about_desc_icon_ok">Wszystko OK.</string>
     <string name="about_desc_icon_tracked_down">Jesteś śledzony!</string>
-    <string name="about_desc_icon_insecure_area">Insecure Service Area. Leave it!</string>
-    <string name="about_desc_icon_run">RUN! Handset manipulated!</string>
+    <string name="about_desc_icon_insecure_area">Niebezpieczny obszar. Opóść go!</string>
+    <string name="about_desc_icon_run">Uciekaj! Telefon ulega manipulacji!</string>
     <string name="about_desc_icon_title">Kliknij na ikonę by uzyskać więcej informacji:</string>
 
 
@@ -127,7 +120,7 @@
     <string name="pref_ocid_key_summ">Wpisz swój klucz API do OpenCellID</string>
     <string name="pref_enable_cell_monitoring_title">Monitorowanie komórek</string>
     <string name="pref_enable_cell_monitoring_summ">Włącz automatyczne monitorowanie komórek</string>
-    <string name="pref_request_ocid_key">Request OCID API Key</string>
+    <string name="pref_request_ocid_key">Zażądaj klucz API OCID</string>
     <string name="pref_ocid_requestkey_summary">Pobierz nowy klucz API dla danych OpenCellID</string>
 
     <!-- MAP PREFERENCES -->
@@ -166,43 +159,43 @@
     <string name="serial_device_title">Obecny numer seryjny urządznia:</string>
     <string name="serial_device_prompt">Wybierz numer seryjny urządzenia</string>
     <string name="serial_device_spinner_title">Wykryte urządzenia:</string>
-    <string name="timeout_spinner_title">Timeout:</string>
+    <string name="timeout_spinner_title">Czas:</string>
     <string name="timeout_spinner_prompt">Wybierz czas oczekiwania na odpowiedź</string>
     <string name="command_hint">Wpisz komendę AT tutaj.</string>
 
     <!-- SILENT SMS FRAGMENT -->
     <string name="sms_title">Przechwycono SilentSMS</string>
-    <string name="sms_message">Przechwycono SilentSMS!\n\nWięcej infromacji w widoku bazy danych.</string>
+    <string name="sms_message">Przechwycono SilentSMS!\nWięcej infromacji w widoku bazy danych.</string>
     <string name="table_contains_no_data">Brak danych do wyświetlenia.</string>
 
     <!-- Request OpenCellID Key -->
     <string name="title_ocid_key">Klucz API OpenCellID</string>
     <string name="message_request_api_key">Wybierz OK by pobrać klucz API z OpenCellID.org. Pozwoli Ci to na pobranie danych i wyświetlanie ich na mapie, oraz na wysyłanie zebranych danych. Jeśli nie wyślesz żadanych danych w ciągu 20dni, Twój klucz może zostać zdezaktywowany.</string>
     <string name="ocid_api_error">Błąd pobierania klucza: </string>
-    <string name="ocid_api_success">Zapisano nowy klucz</string>
+    <string name="ocid_api_success">Zapisano nowy klucz API.</string>
 
     <!-- Debug logs -->
     <string name="title_debug_logs">Logi</string>
     <string name="btn_clear_logs">Wyczyść</string>
     <string name="btn_copy_to_clipboard">Kopiuj</string>
-    <string name="msg_copied_to_clipboard">Skopiowano logi do schowka</string>
+    <string name="msg_copied_to_clipboard">Skopiowano logi do schowka.</string>
     <string name="btn_stop_logs">Zakończ</string>
     <string name="btn_start_logs">Rozpocznij</string>
 
     <!-- Detailed Info Strings -->
     <string name="title_activity_about_pop_up">SZCZEGÓŁOWY OPIS</string>
-    <string name="detail_info_idle">Aplikacja jest bezczynna. Włącz śledzenie w menu.</string>
+    <string name="detail_info_idle">Aplikacja jest bezczynna lub ładuje się. Żadne środki ochrony lub wykrywania nie są włączone. Otwórz panel nawigacyjny i włącz śledzenie w menu!</string>
     <string name="detail_info_normal">Nie wykryto żadnych zagrożeń.</string>
     <string name="detail_info_medium">Ta okolica nie jest bezpieczna: wykryto co najmniej jedną nieznaną stację bazową lub używane jest szyfrowanie słabsze niż A5/3. Wszystkie wiadomości i rozmowy w tym rejonie mogą być przechwycone.</string>
     <string name="detail_info_high">Wykryto wrogą aktywność: IMIC lub FBTS aktywnie śledzi użytkowników! Wyjmij baterię z telefoni i unikaj tego miejsca!</string>
-    <string name="detail_info_danger">Wykryto śledzenie: W pobliżu jest aktywny FBTS lub IMSIC, uniemożliwiając bezpieczne, szyfrowane połączenie z dostawcą sieci. Pozbądź się swojego telefou, zniszcz kartę SIM i zgłoś ją jako zagubioną!</string>
+    <string name="detail_info_danger">Wykryto wrogie śledzenie: W pobliżu jest aktywny FBTS lub IMSIC, uniemożliwiając bezpieczne, szyfrowane połączenie z dostawcą sieci. Jeśli jesteś w niebezpieczeństwie zniszczy swój telefon i kartę SIM i zgłoś ją jako niedawno ukradzioną.</string>
     <string name="detail_info_run">Wykryto manipulację: ktoś próbuje zdalnie manipulować Twoim telefonem. Zniszcz lub sprzedaj telefon!</string>
     <string name="open_cell_id_button_cancel">Anuluj</string>
     <string name="open_cell_id_button_ok">OK</string>
 
     <!-- UI Icon Preferences -->
     <string name="ui_icon_flat">Płaskie</string>
-    <string name="ui_icon_sense">Sense</string>
+    <string name="ui_icon_sense">Wykrywanie</string>
     <string name="ui_icon_white">Białe</string>
     <string name="map_type_terrain">Teren</string>
     <string name="map_type_normal">Zwyczajna</string>
@@ -235,21 +228,21 @@
     <string name="cell_tracking_active">Śledzenie komórek aktywne.</string>
     <string name="cell_monitoring_active">Monitoring komórek aktywny.</string>
     <string name="phone_type">Rodzaj telefonu</string>
-    <string name="status_idle">Oczekuję&#8230;</string>
+    <string name="status_idle">Status: Oczekuję.</string>
     <string name="status_good">Brak zagrożeń. Wszystko OK.</string>
     <string name="alert_threat_detected">UWAGA: Wykryto zagrożenie!</string>
     <string name="alert_femtocell_connection_detected">UWAGA: Wykryto połączenie FemtoCell!</string>
-    <string name="alert_silent_sms_detected">UWAGA: Wykryto SilentSMS (Type-0)!</string>
-    <string name="alert_silent_voice_sms_detected">ALERT: Silent Voice SMS detected!</string>
+    <string name="alert_silent_sms_detected">UWAGA: Wykryto Silent SMS!</string>
+    <string name="alert_mwi_detected">ALERT: Message Waiting Indicator detected!</string>
     <string name="alert_silent_wap_sms_detected">ALERT: Wap Push SMS detected!</string>
     <string name="femtocell_only_on_cdma_devices">Aplikacja potrafi wykrywać FemtoCell tylko przez połączenie CDMA.</string>
     <string name="service_state_changed">Zmieniony został stan usługi!</string>
     <string name="stopped_tracking_femtocell">: Wstrzymano śledzenie połączeń FemtoCell.</string>
     <string name="alert_femtocell_tracking_detected">UWAGA! Wykryto śledzenie FemtoCell!</string>
     <string name="refreshing_every">Odświeżanie co</string>
-    <string name="refreshing_now">Odświeżam&#8230;</string>
+    <string name="refreshing_now">Odświeżam…</string>
     <string name="seconds">sekund.</string>
-    <string name="contacting_opencellid_for_data">Łączenie z OpenCellID by uzyskać potrzebne dane&#8230;\nMoże to potrwać nawet minutę.</string>
+    <string name="contacting_opencellid_for_data">Łączenie z OpenCellID by uzyskać potrzebne dane…\nMoże to potrwać nawet minutę.</string>
     <string name="unable_to_determine_last_location">Nie udalo się określić Twojej ostatniej lokalizacji. Włącz lokalizację w ustawieniach telefonu.</string>
     <string name="no_tracked_locations_found">Brak zapisanych lokalizacji do pokazania.</string>
     <string name="no_data_for_publishing">Brak nowych danych do wysłania.</string>
@@ -267,9 +260,9 @@
     <string name="refreshing_display">Odświeżanie ekranu</string>
     <string name="unable_to_acquire_root_access">Nie udało się usyskać praw ROOTa. Interface komend AT wymaga praw ROOTa. Sprawdź swoje urządzenie i spróbuj ponownie.</string>
     <string name="unable_to_detect_busybox">Nie udało się odnaleźć BusyBox na Twoim urządzeniu. Interface komend AT wymaga BusyBoxa! Sprawdź swoje urządzenie i spróbuj ponownie.</string>
-    <string name="unknown_error_trying_to_acquire_serial_device">Wystąpił nieznany bład przy próbie uzyskania Serial Device. Prosimy o sprawdzenie logów i przesłanie ich do nas na Github. Link do Githuba znajedziesz w sekcji \'O aplikacji\'.</string>
+    <string name="unknown_error_trying_to_acquire_serial_device">Wystąpił nieznany bład przy próbie uzyskania klucza seryjnego urządzenia. Prosimy o sprawdzenie logów i przesłanie ich do nas na Github.</string>
     <string name="unknown_error_initialising_at_command_injector">AWystąpił nieznany błąd przy uruchamianiu inteface komend AT. Prosimy o sprawdzenie logów i przesłanie ich do nas na Github. Link do Githuba znajedziesz w sekcji \'O aplikacji\'.</string>
-    <string name="getting_ocid_api_key">Pobieranie klucza OpenCellID&#8230;</string>
+    <string name="getting_ocid_api_key">Pobieranie klucza OpenCellID…</string>
     <string name="unable_to_create_map">Nie powiodło się tworzenie mapy!</string>
     <string name="describe_the_problem_you_had">W celu uzyskania pomocy opisz swój problem. Problemy bez opisu są automatycznie ignorowane!\n</string>
     <string name="status">Status:</string>
@@ -281,32 +274,32 @@
     <string name="run">UCIEKAJ!</string>
 
     <!-- Advanced User Settings: SMS Detection Strings -->
-    <string name="adv_user_info">This menu is for advanced users only!\n\nPlease do not insert random strings because it will cause detection to go out of control.\n\nTo add a string choose the SMS type from the dropdown menu, type your detection string and press insert.\n\nTo delete from database long press on list view.</string>
+    <string name="adv_user_info">To menu jest tylko dla zaawansowanych użytkowników!\n\nProszę nie wprowadzaj losowych ciągów znaków gdyż sprawi to, że wykrywanie nie będzie działać przewidywalnie.\n\nAby dodać łańcuch znaków wybierz typ SMS z rozwijanego menu, wpisz łańcuch znaków i naciśnij dodaj.\n\nAby usunąć z bazy danych przyciśnij dłużej w widoku listy.</string>
     
     <!-- Advanced User Settings: Delete Detected SMS -->
-    <string name="adv_user_sms_info">This menu is for advanced users only!\nTo delete a detected SMS long press it in listview.</string>
-    <string name="title_activity_advanced_user">Delete Detected SMS</string>
-
-    <string name="adv_user_pref_header">Advanced User Settings</string>
-    <string name="adv_user_pref_launch">Detection Strings</string>
-    <string name="adv_user_pref_sms_launch">Delete SMS</string>
-    <string name="adv_user_pref_summary">Insert and delete detection strings</string>
-    <string name="adv_user_pref_sms_summary">Delete Detected SMS</string>
+    <string name="adv_user_sms_info">To menu jest tylko dla zaawansowanych użytkowników!\nAby usunąć wykryty SMS naciśnij go długo w widoku listy.</string>
+    <string name="title_activity_advanced_user">Skasuj wykryty SMS</string>
+
+    <string name="adv_user_pref_header">Ustawienia zaawansowane</string>
+    <string name="adv_user_pref_launch">Łańcuchy znaków wykrywania</string>
+    <string name="adv_user_pref_sms_launch">Skasuj SMS</string>
+    <string name="adv_user_pref_summary">Wprowadzanie i usuwanie łańcuchów znaków wykrywania</string>
+    <string name="adv_user_pref_sms_summary">Skasuj wykrytye SMSy</string>
    
     <!-- Advanced User Settings: Enable SMS Detection -->
-    <string name="adv_user_root_title">Enable SMS Detection</string>
-    <string name="adv_user_root_sum">Root is required to enable SMS detection</string>
+    <string name="adv_user_root_title">Włącz wykrywanie SMSów</string>
+    <string name="adv_user_root_sum">Aby uaktywnić wykrywanie SMSów wymagane są prawa Roota</string>
 
     <!-- Detected SMS string for custom popup -->
-    <string name="detection_strings">Detection Strings</string>
-    <string name="typezero_title">ATTENTION!</string>
-    <string name="typezero_header">Type0 SMS Detected</string>
-    <string name="typezero_data">Silent SMS Message detected!\n\nDetails: See Database Viewer.\n\nIf you want this data to be analysed by our developers, send the logfiles through the Debugging menu.</string>
-    <string name="typevoice_title">ATTENTION!</string>
-    <string name="typevoice_header">Silent Voice Detected</string>
-    <string name="typevoice_data">Silent Voice SMS Message detected!\n\nDetails: See Database Viewer.\n\nIf you want this data to be analysed by our developers, send the logfiles through the Debugging menu.</string>
+    <string name="detection_strings">Łańcuchy znaków wykrywania</string>
+    <string name="typezero_title">UWAGA!</string>
+    <string name="typezero_header">Wykryto Silent SMS</string>
+    <string name="typezero_data">Wykryto Typu-0 SMS!\nSzczegóły: Zobacz Database Viewer.</string>
+    <string name="typemwi_title">UWAGA!</string>
+    <string name="typemwi_header">Wykryto MWI</string>
+    <string name="typemwi_data">Message Waiting Indicator detected!\nDetails: See Database Viewer.</string>
     <string name="typewap_header">Wap Push Detected</string>
-    <string name="typewap_data">Wap Push SMS Message has been detected!\n\nDetails are available through the Database Viewer.\n\nIf you want this data to be analysed by our devs, enter the Debugging menu and send the logfiles via E-Mail.</string>
+    <string name="typewap_data">Wykryto WAP Push SMS!\nSzczegóły: Zobacz Database Viewer.</string>
 
 
     <!-- Section Main-->
@@ -330,33 +323,33 @@
     <string name="help_settings_import_db_from_csv">Importuj do bazy danych z plików CSV.</string>
 
     <!-- Section Application-->
-    <string name="help_app_add_get_ocid_api_key">Uzyskaj klucz API do OpenCellID by pobierać i wysyłać dane&#8230;</string>
+    <string name="help_app_add_get_ocid_api_key">Uzyskaj klucz API do OpenCellID by pobierać i wysyłać dane…</string>
     <string name="help_app_about">O nas i kogo wspieramy.</string>
     <string name="help_app_download_local_bst">Pobierz bazę danych OCID.</string>
     <string name="help_app_upload_local_bst">Wyślij dane o lokalnych BTS do OCID.</string>
     <string name="help_app_debugging">Wczytaj i wyślij logi.</string>
     <string name="help_app_quit">Zakończ działanie aplikacji.</string>
-    <string name="waiting_for_location">Oczekiwanie na lokalizację&#8230;</string>
+    <string name="waiting_for_location">Oczekiwanie na lokalizację…</string>
     <string name="unable_to_restore_backup_from_previous_database_version">Nie udało się odzyskać kopii z poprzedniej wersji bazy danych!</string>
     <string name="unique_bts_data">Unikalne dane BTS</string>
     <string name="bts_measurements">Pomiary BTS</string>
     <string name="imported_ocid_data">Importowane dane OpenCellID</string>
     <string name="default_mmc_locations">Domyślne lokalizacje MMC</string>
-    <string name="silent_sms">Silent SMS</string>
+    <string name="silent_sms">Bezgłośny SMS</string>
     <string name="eventlog">Logi zdarzeń</string>
     <string name="measured_signal_strengths">Pomiary siły sygnałów</string>
 
-    <string name="at_command_response_looking">*** Wykrywanie urządzeń AT&#8230;\n</string>
-    <string name="at_command_response_found">Wykryto:&#032;</string>
+    <string name="at_command_response_looking">*** Wykrywanie urządzeń AT…\n</string>
+    <string name="at_command_response_found">Wykryto: </string>
     <string name="at_command_response_setup_complete">*** Konfiguracja zakończona ***\n</string>
 
-    <string name="currently_connected_bts">Currently connected BTS</string>
-    <string name="well_known_encrypted_bts">Well known encrypted BTS</string>
-    <string name="unknown_or_insecure_bts">Unknown or insecure BTS</string>
-    <string name="new_or_recently_added_bts">New or recently added BTS</string>
+    <string name="currently_connected_bts">Obecnie podłączony BTS</string>
+    <string name="well_known_encrypted_bts">Dobrze znany szyfrujący BTS</string>
+    <string name="unknown_or_insecure_bts">Nieznany lub niebezpieczny BTS</string>
+    <string name="new_or_recently_added_bts">Nowy lub niedawno dodany BTS</string>
 
-    <string name="invalid_key_try_later">Invalid OpenCellId key, try again later.</string>
-    <string name="getting_ocid_key">Getting OpenCellId API Key...</string>
+    <string name="invalid_key_try_later">Nieprawidłowany klucz OpenCell ID, spróbuj później.</string>
+    <string name="getting_ocid_key">Pobieranie klucza API OpenCellId...</string>
 
     <string-array name="pref_ui_icons_entries">
         <item>@string/ui_icon_flat</item>
@@ -390,4 +383,4 @@
         <item>@string/timeout_spinner_10_min</item>
     </string-array>
 
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file

app/src/main/res/values-ru/translatable_strings.xml

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 
     <!-- Drawer -->
@@ -41,7 +41,7 @@
 
     <string name="restore_database">Восстановить базу данных</string>
     <string name="preferences">Параметры</string>
-    <string name="press_once_again_to_exit">Нажмите еще раз для выхода</string>
+    <string name="press_once_again_to_exit">Нажмите еще раз для выхода.</string>
     <string name="cell_lookup">Все текущие сотовые сведения</string>
     <string name="send_logs">Отладка</string>
 
@@ -86,7 +86,7 @@
 
     <!-- ABOUT LAYOUT -->
     <string name="about_aimsicd">Об AIMSICD</string>
-    <string name="app_version">Версия:&#160;</string>
+    <string name="app_version">Версия: </string>
     <string name="aimsicd_about_info3">Проект для обнаружения и избегания поддельных базовых станций (IMSI-перехватчики) в GSM / UMTS сети на основе Android.</string>
     <string name="about_github">AIMSICD на GitHub</string>
     <string name="about_wiki">Документация (WIKI)</string>
@@ -102,7 +102,7 @@
     <string name="about_desc_icon_tracked_down">Вас отслеживают!</string>
     <string name="about_desc_icon_insecure_area">Небезопасная зона обслуживания. Покиньте ее!</string>
     <string name="about_desc_icon_run">Беги! Манипулируют телефоном!</string>
-    <string name="about_desc_icon_title">Нажмите значки состояния ниже для более подробной информации</string>
+    <string name="about_desc_icon_title">Нажмите значки состояния ниже для более подробной информации:</string>
 
     <!-- CDMA LAYOUT -->
     <string name="network_netid">ID сети:</string>
@@ -181,20 +181,20 @@
 
     <!-- SILENT SMS FRAGMENT -->
     <string name="sms_title">Бесшумная SMS перехвачена</string>
-    <string name="sms_message">Бесшумная SMS была перехвачена!\n\nПодробная информация доступна через просмотр базы данных.</string>
+    <string name="sms_message">Бесшумная SMS была перехвачена!\nПодробности: См просмотра базы данных.</string>
     <string name="table_contains_no_data">Таблица не содержит никаких данных для отображения.</string>
 
     <!-- Request OpenCellID Key -->
     <string name="title_ocid_key">OpenCellID ключ API</string>
     <string name="message_request_api_key">Нажмите OK для запроса ключа API из OpenCellID.org. Это позволит вам скачать их данные и просмотреть его на карте. Это также позволит вам выгружать данные сотовых сетей. Обратите внимание, что если вы не выгружать данные сотовых сетей в течение 20 дней, ваш ключ API может стать неактивным.</string>
     <string name="ocid_api_error">Ошибка получения ключа: </string>
-    <string name="ocid_api_success">Сохранен новый ключ API</string>
+    <string name="ocid_api_success">Сохранен новый ключ API.</string>
 
     <!-- Debug logs -->
     <string name="title_debug_logs">Логи отладки</string>
     <string name="btn_clear_logs">Очистить</string>
     <string name="btn_copy_to_clipboard">Копировать</string>
-    <string name="msg_copied_to_clipboard">Логи скопированы в буфер обмена</string>
+    <string name="msg_copied_to_clipboard">Логи скопированы в буфер обмена.</string>
     <string name="btn_stop_logs">Стоп</string>
     <string name="btn_start_logs">Старт</string>
 
@@ -249,15 +249,15 @@
     <string name="status_good">Статус: Хорошо. Угроз не обнаружено.</string>
     <string name="alert_threat_detected">ТРЕВОГА: Обнаружены некоторые угрозы!</string>
     <string name="alert_femtocell_connection_detected">ТРЕВОГА: Обнаружено соединение с фемтосотой!</string>
-    <string name="alert_silent_sms_detected">ТРЕВОГА: обнаруженный бесшумная SMS (Type-0)!</string>
+    <string name="alert_silent_sms_detected">ТРЕВОГА: обнаруженный бесшумная SMS!</string>
     <string name="femtocell_only_on_cdma_devices">AIMSICD может определять соединение с фемтосотой только на CDMA устройствах.</string>
     <string name="service_state_changed">Статус сервиса изменен!</string>
     <string name="stopped_tracking_femtocell">: Остановлен мониториг соединения с фемтосотой.</string>
-    <string name="alert_femtocell_tracking_detected">ТРЕВОГА! Обнаружен мониторинг фемтосоты.</string>
+    <string name="alert_femtocell_tracking_detected">ТРЕВОГА: Обнаружен мониторинг фемтосоты!</string>
     <string name="refreshing_every">Обновлять каждые</string>
-    <string name="refreshing_now">Обновить сейчас&#8230;</string>
+    <string name="refreshing_now">Обновить сейчас…</string>
     <string name="seconds">секунд.</string>
-    <string name="contacting_opencellid_for_data">Обращение к данным OpenCellID&#8230;\nЭто может занять до минуты.</string>
+    <string name="contacting_opencellid_for_data">Обращение к данным OpenCellID…\nЭто может занять до минуты.</string>
     <string name="unable_to_determine_last_location">Невозможно определить ваш последнее место.\nВключите сервис определения координат и попробуйте еще раз.</string>
     <string name="no_tracked_locations_found">Не найдено отслеживаемых мест, чтобы показать их на карте.</string>
     <string name="no_data_for_publishing">Нет доступных данных для публикации.</string>
@@ -273,11 +273,11 @@
     <string name="error_backing_up_data">Ошибка резервного копирования базы данных.</string>
     <string name="no_opencellid_key_detected">No OpenCellID API Key detected!\nPlease enter your key in settings first.</string>
     <string name="refreshing_display">Обновление дисплея</string>
-    <string name="unable_to_acquire_root_access">Невозможно получить ROOT доступ на вашем устройстве.\nДля инъекций AT-команд в терминал требуется ROOT доступ.\nПожалуйста, проверьте наличие ROOT прав на вашем устройстве и попробуйте еще раз</string>
-    <string name="unable_to_detect_busybox">Невозможно обнаружить Busybox на вашем устройстве.\nДля инъекций AT-команд в терминал требуются компоненты Busybox для правильного функционирования.\nПожалуйста, проверьте, что Busybox установлен на ваше устройство  и попробуйте снова</string>
+    <string name="unable_to_acquire_root_access">Невозможно получить ROOT доступ на вашем устройстве.\nДля инъекций AT-команд в терминал требуется ROOT доступ.\nПожалуйста, проверьте наличие ROOT прав на вашем устройстве и попробуйте еще раз.</string>
+    <string name="unable_to_detect_busybox">Невозможно обнаружить Busybox на вашем устройстве.\nДля инъекций AT-команд в терминал требуются компоненты Busybox для правильного функционирования.\nПожалуйста, проверьте, что Busybox установлен на ваше устройство и попробуйте снова.</string>
     <string name="unknown_error_trying_to_acquire_serial_device">Произошла неизвестная ошибка при попытке достижения Serial Device.\nПожалуйста, проверьте LogCat на возможные ошибки и отправьте их на Github.</string>
     <string name="unknown_error_initialising_at_command_injector">An unknown error has occurred trying to initialise the AT Command Injector.\nPlease check your logcat for any errors and post them on our Github.</string>
-    <string name="getting_ocid_api_key">Получение ключа API OpenCellID&#8230;</string>
+    <string name="getting_ocid_api_key">Получение ключа API OpenCellID…</string>
     <string name="unable_to_create_map">Невозможно создать карту!</string>
     <string name="describe_the_problem_you_had">ВНИМАНИЕ! Пожалуйста, опишите проблему, которая у вас была, прежде, чем отправить нам эти журналы. НЕТ ПОМОЩИ БЕЗ ОПИСАНИЯ!\n</string>
     <string name="status">Статус:</string>
@@ -309,13 +309,13 @@
     <string name="help_settings_import_db_from_csv">Import DB table(s) from individual CSV file(s).</string>
 
     <!-- Section Application-->
-    <string name="help_app_add_get_ocid_api_key">Get an API key for using the OpenCellID database to upload and download data&#8230;</string>
+    <string name="help_app_add_get_ocid_api_key">Get an API key for using the OpenCellID database to upload and download data…</string>
     <string name="help_app_about">Status Icons and Project explained.</string>
     <string name="help_app_download_local_bst">Downloads the OCID Database.</string>
     <string name="help_app_upload_local_bst">Uploads your BTS to the OCID Database.</string>
     <string name="help_app_debugging">Collect and send error logs.</string>
     <string name="help_app_quit">Exit this app.</string>
-    <string name="waiting_for_location">Waiting for location&#8230;</string>
+    <string name="waiting_for_location">Waiting for location…</string>
     <string name="unable_to_restore_backup_from_previous_database_version">Unable to restore backup from previous database version due to structural changes!</string>
     <string name="unique_bts_data">Unique BTS Data</string>
     <string name="bts_measurements">BTS Measurements</string>
@@ -325,8 +325,8 @@
     <string name="eventlog">EventLog</string>
     <string name="measured_signal_strengths">Measured Signal Strengths</string>
 
-    <string name="at_command_response_looking">*** Looking for AT serial devices&#8230;\n</string>
-    <string name="at_command_response_found">Found:&#032;</string>""
+    <string name="at_command_response_looking">*** Looking for AT serial devices…\n</string>
+    <string name="at_command_response_found">Found: </string>""
     <string name="at_command_response_setup_complete">*** Setup Complete ***\n</string>""
     <string-array name="pref_ui_icons_entries">
         <item>@string/ui_icon_flat</item>
@@ -360,4 +360,4 @@
         <item>@string/timeout_spinner_10_min</item>
     </string-array>
 
-</resources>
\ No newline at end of file
+</resources>