Update app version number

Add support for posting locations over HTTPS

.gitignore

@@ -3,3 +3,4 @@
 local.properties
 *.iml
 build/
+.DS_Store

LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,15 +1,15 @@
 # [Traccar Client for Android](https://www.traccar.org/client)
 
-## Contacts
-
-Author - Anton Tananaev ([anton.tananaev@gmail.com](mailto:anton.tananaev@gmail.com))
-
-Website - [https://www.traccar.org/client](https://www.traccar.org/client)
+[![](https://play.google.com/intl/en_us/badges/images/badge_new.png)](https://play.google.com/store/apps/details?id=org.traccar.client)
 
 ## Overview
 
 Traccar Client is an Android GPS tracking application. It can work with Traccar open source server software.
 
+## Team
+
+- Anton Tananaev ([anton@traccar.org](mailto:anton@traccar.org))
+
 ## License
 
     Apache License, Version 2.0

app/build.gradle

@@ -1,23 +1,18 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.3'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         minSdkVersion 3
-        targetSdkVersion 23
-        versionCode 31
-        versionName '3.11'
+        targetSdkVersion 25
+        versionCode 34
+        versionName '4.1'
     }
 
-    signingConfigs {
-        release {
-            storeFile file('../../android.keystore')
-            keyAlias 'tananaev'
-            storePassword ''
-            keyPassword ''
-        }
+    lintOptions {
+        checkReleaseBuilds false
     }
 
     productFlavors {
@@ -34,27 +29,12 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            signingConfig signingConfigs.release
+            proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
     }
-
-    lintOptions {
-        checkReleaseBuilds false
-    }
 }
 
 dependencies {
     testCompile 'junit:junit:4.12'
     testCompile 'org.robolectric:robolectric:3.0'
 }
-
-task requestPasswords << {
-    android.signingConfigs.release.storePassword = new String(System.console().readPassword('\nStore password: '))
-    android.signingConfigs.release.keyPassword = new String(System.console().readPassword('Key password: '))
-}
-
-tasks.whenTaskAdded { theTask ->
-    if (theTask.name.equals('packageRegularRelease') || theTask.name.equals('packageHiddenRelease')) {
-        theTask.dependsOn 'requestPasswords'
-    }
-}

app/src/main/AndroidManifest.xml

@@ -14,7 +14,8 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/TraccarTheme">
+        android:theme="@style/TraccarTheme"
+        android:name=".MainApplication">
 
         <activity android:name=".MainActivity" android:launchMode="singleTask" />
 

app/src/main/java/org/traccar/client/MainActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 import android.preference.TwoStatePreference;
-import android.util.Patterns;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -43,9 +43,12 @@ import java.util.Set;
 @SuppressWarnings("deprecation")
 public class MainActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener {
 
+    private static final String TAG = MainActivity.class.getSimpleName();
+
     public static final String KEY_DEVICE = "id";
     public static final String KEY_ADDRESS = "address";
     public static final String KEY_PORT = "port";
+    public static final String KEY_SECURE = "secure";
     public static final String KEY_INTERVAL = "interval";
     public static final String KEY_PROVIDER = "provider";
     public static final String KEY_STATUS = "status";
@@ -91,10 +94,9 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
                 if (newValue != null) {
                     try {
                         int value = Integer.parseInt((String) newValue);
-                        if (value > 0 && value <= 65536) {
-                            return true;
-                        }
+                        return value > 0 && value <= 65536;
                     } catch (NumberFormatException e) {
+                        Log.w(TAG, e);
                     }
                 }
                 return false;
@@ -105,9 +107,10 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 if (newValue != null) {
                     try {
-                        Integer.parseInt((String) newValue);
-                        return true;
+                        int value = Integer.parseInt((String) newValue);
+                        return value > 0;
                     } catch (NumberFormatException e) {
+                        Log.w(TAG, e);
                     }
                 }
                 return false;
@@ -138,11 +141,10 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
         }
     }
 
-    private void addShortcuts(boolean start, int name) {
+    private void addShortcuts(String action, int name) {
         Intent shortcutIntent = new Intent(Intent.ACTION_MAIN);
         shortcutIntent.setComponent(new ComponentName(getPackageName(), ShortcutActivity.class.getCanonicalName()));
-        shortcutIntent.putExtra(ShortcutActivity.EXTRA_ACTION, start);
-
+        shortcutIntent.putExtra(ShortcutActivity.EXTRA_ACTION, action);
         Intent installShortCutIntent = new Intent("com.android.launcher.action.INSTALL_SHORTCUT");
         installShortCutIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
         installShortCutIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(name));
@@ -175,6 +177,7 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
         findPreference(KEY_DEVICE).setEnabled(enabled);
         findPreference(KEY_ADDRESS).setEnabled(enabled);
         findPreference(KEY_PORT).setEnabled(enabled);
+        findPreference(KEY_SECURE).setEnabled(enabled);
         findPreference(KEY_INTERVAL).setEnabled(enabled);
         findPreference(KEY_PROVIDER).setEnabled(enabled);
     }
@@ -204,8 +207,9 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
             startActivity(new Intent(this, StatusActivity.class));
             return true;
         } else if (item.getItemId() == R.id.shortcuts) {
-            addShortcuts(true, R.string.shortcut_start);
-            addShortcuts(false, R.string.shortcut_stop);
+            addShortcuts(ShortcutActivity.EXTRA_ACTION_START, R.string.shortcut_start);
+            addShortcuts(ShortcutActivity.EXTRA_ACTION_STOP, R.string.shortcut_stop);
+            addShortcuts(ShortcutActivity.EXTRA_ACTION_SOS, R.string.shortcut_sos);
             return true;
         } else if (item.getItemId() == R.id.about) {
             startActivity(new Intent(this, AboutActivity.class));
@@ -237,7 +241,10 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
             if (missingPermissions.isEmpty()) {
                 permission = true;
             } else {
-                requestPermissions(missingPermissions.toArray(new String[missingPermissions.size()]), PERMISSIONS_REQUEST_LOCATION);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    requestPermissions(missingPermissions.toArray(new String[missingPermissions.size()]),
+                            PERMISSIONS_REQUEST_LOCATION);
+                }
                 return;
             }
         }
@@ -268,8 +275,14 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
     @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         if (requestCode == PERMISSIONS_REQUEST_LOCATION) {
-            startTrackingService(false, grantResults[0] == PackageManager.PERMISSION_GRANTED &&
-                    (permissions.length < 2 || grantResults[1] == PackageManager.PERMISSION_GRANTED));
+            boolean granted = true;
+            for (int result : grantResults) {
+                if (result != PackageManager.PERMISSION_GRANTED) {
+                    granted = false;
+                    break;
+                }
+            }
+            startTrackingService(false, granted);
         }
     }
 

app/src/main/java/org/traccar/client/MainApplication.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import android.app.Application;
+
+public class MainApplication extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        System.setProperty("http.keepAliveDuration", String.valueOf(30 * 60 * 1000));
+    }
+
+}

app/src/main/java/org/traccar/client/MixedPositionProvider.java

@@ -23,6 +23,7 @@ import android.location.LocationManager;
 import android.os.Bundle;
 import android.util.Log;
 
+@SuppressWarnings("MissingPermission")
 public class MixedPositionProvider extends PositionProvider implements LocationListener, GpsStatus.Listener {
 
     private static int FIX_TIMEOUT = 30 * 1000;
@@ -37,7 +38,11 @@ public class MixedPositionProvider extends PositionProvider implements LocationL
     public void startUpdates() {
         lastFixTime = System.currentTimeMillis();
         locationManager.addGpsStatusListener(this);
-        locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, period, 0, this);
+        try {
+            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, period, 0, this);
+        } catch (IllegalArgumentException e) {
+            Log.w(TAG, e);
+        }
     }
 
     public void stopUpdates() {

app/src/main/java/org/traccar/client/Patterns.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import java.util.regex.Pattern;
+
+public class Patterns {
+
+    private static final String IP_ADDRESS_STRING =
+            "((25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9])\\.(25[0-5]|2[0-4]"
+                    + "[0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1]"
+                    + "[0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}"
+                    + "|[1-9][0-9]|[0-9]))";
+
+    private static final String UCS_CHAR = "[" +
+            "\u00A0-\uD7FF" +
+            "\uF900-\uFDCF" +
+            "\uFDF0-\uFFEF" +
+            "\uD800\uDC00-\uD83F\uDFFD" +
+            "\uD840\uDC00-\uD87F\uDFFD" +
+            "\uD880\uDC00-\uD8BF\uDFFD" +
+            "\uD8C0\uDC00-\uD8FF\uDFFD" +
+            "\uD900\uDC00-\uD93F\uDFFD" +
+            "\uD940\uDC00-\uD97F\uDFFD" +
+            "\uD980\uDC00-\uD9BF\uDFFD" +
+            "\uD9C0\uDC00-\uD9FF\uDFFD" +
+            "\uDA00\uDC00-\uDA3F\uDFFD" +
+            "\uDA40\uDC00-\uDA7F\uDFFD" +
+            "\uDA80\uDC00-\uDABF\uDFFD" +
+            "\uDAC0\uDC00-\uDAFF\uDFFD" +
+            "\uDB00\uDC00-\uDB3F\uDFFD" +
+            "\uDB44\uDC00-\uDB7F\uDFFD" +
+            "&&[^\u00A0[\u2000-\u200A]\u2028\u2029\u202F\u3000]]";
+
+    private static final String LABEL_CHAR = "a-zA-Z0-9" + UCS_CHAR;
+
+    private static final String IRI_LABEL =
+            "[" + LABEL_CHAR + "](?:[" + LABEL_CHAR + "\\-]{0,61}[" + LABEL_CHAR + "]){0,1}";
+
+    private static final String RELAXED_DOMAIN_NAME =
+            "(?:" + "(?:" + IRI_LABEL + "(?:\\.(?=\\S))" +"?)+" + "|" + IP_ADDRESS_STRING + ")";
+
+    public static final Pattern DOMAIN_NAME = Pattern.compile(RELAXED_DOMAIN_NAME);
+
+}

app/src/main/java/org/traccar/client/PositionProvider.java

@@ -55,9 +55,9 @@ public abstract class PositionProvider {
         locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
 
         deviceId = preferences.getString(MainActivity.KEY_DEVICE, null);
-        period = Integer.parseInt(preferences.getString(MainActivity.KEY_INTERVAL, null)) * 1000;
+        period = Long.parseLong(preferences.getString(MainActivity.KEY_INTERVAL, null)) * 1000;
 
-        type = preferences.getString(MainActivity.KEY_PROVIDER, null);
+        type = preferences.getString(MainActivity.KEY_PROVIDER, "gps");
     }
 
     public abstract void startUpdates();
@@ -68,14 +68,14 @@ public abstract class PositionProvider {
         if (location != null && location.getTime() - lastUpdateTime >= period) {
             Log.i(TAG, "location new");
             lastUpdateTime = location.getTime();
-            listener.onPositionUpdate(new Position(deviceId, location, getBatteryLevel()));
+            listener.onPositionUpdate(new Position(deviceId, location, getBatteryLevel(context)));
         } else {
             Log.i(TAG, location != null ? "location old" : "location nil");
         }
     }
 
     @TargetApi(Build.VERSION_CODES.ECLAIR)
-    private double getBatteryLevel() {
+    public static double getBatteryLevel(Context context) {
         if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.ECLAIR) {
             Intent batteryIntent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
             int level = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);

app/src/main/java/org/traccar/client/ProtocolFormatter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,18 @@
  */
 package org.traccar.client;
 
-import android.location.Location;
 import android.net.Uri;
 
 public class ProtocolFormatter {
 
-    public static String formatRequest(String address, int port, Position position) {
+    public static String formatRequest(String address, int port, boolean secure, Position position) {
+        return formatRequest(address, port, secure, position, null);
+    }
+
+    public static String formatRequest(String address, int port, boolean secure, Position position, String alarm) {
 
         Uri.Builder builder = new Uri.Builder();
-        builder.scheme("http").encodedAuthority(address + ':' + port)
+        builder.scheme(secure ? "https" : "http").encodedAuthority(address + ':' + port)
                 .appendQueryParameter("id", position.getDeviceId())
                 .appendQueryParameter("timestamp", String.valueOf(position.getTime().getTime() / 1000))
                 .appendQueryParameter("lat", String.valueOf(position.getLatitude()))
@@ -33,6 +36,10 @@ public class ProtocolFormatter {
                 .appendQueryParameter("altitude", String.valueOf(position.getAltitude()))
                 .appendQueryParameter("batt", String.valueOf(position.getBattery()));
 
+        if (alarm != null) {
+            builder.appendQueryParameter("alarm", alarm);
+        }
+
         return builder.build().toString();
     }
 

app/src/main/java/org/traccar/client/ShortcutActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 - 2017 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,23 @@
 package org.traccar.client;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.location.Location;
+import android.location.LocationManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.widget.Toast;
 
 public class ShortcutActivity extends Activity {
 
-    public static final String EXTRA_ACTION = "shortcutAction";
+    public static final String EXTRA_ACTION = "action";
+    public static final String EXTRA_ACTION_START = "start";
+    public static final String EXTRA_ACTION_STOP = "stop";
+    public static final String EXTRA_ACTION_SOS = "sos";
+
+    private static final String ALARM_SOS = "sos";
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -37,20 +46,71 @@ public class ShortcutActivity extends Activity {
         checkShortcutAction(intent);
     }
 
-    private void checkShortcutAction(Intent intent) {
-        if (intent.hasExtra(EXTRA_ACTION)) {
-            boolean start = intent.getBooleanExtra(EXTRA_ACTION, false);
-            PreferenceManager.getDefaultSharedPreferences(this)
-                    .edit().putBoolean(MainActivity.KEY_STATUS, start).commit();
-            if (start) {
-                startService(new Intent(this, TrackingService.class));
-                Toast.makeText(this, R.string.status_service_create, Toast.LENGTH_SHORT).show();
-            } else {
-                stopService(new Intent(this, TrackingService.class));
-                Toast.makeText(this, R.string.status_service_destroy, Toast.LENGTH_SHORT).show();
-            }
-            finish();
+    @SuppressWarnings("MissingPermission")
+    private void sendAlarm() {
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+        LocationManager locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+
+        Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+        if (location == null) {
+            location = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+        }
+
+        if (location != null) {
+
+            Position position = new Position(
+                    preferences.getString(MainActivity.KEY_DEVICE, null),
+                    location, PositionProvider.getBatteryLevel(this));
+
+            String request = ProtocolFormatter.formatRequest(
+                    preferences.getString(MainActivity.KEY_ADDRESS, null),
+                    Integer.parseInt(preferences.getString(MainActivity.KEY_PORT, null)),
+                    preferences.getBoolean(MainActivity.KEY_SECURE, false),
+                    position, ALARM_SOS);
+
+            RequestManager.sendRequestAsync(request, new RequestManager.RequestHandler() {
+                @Override
+                public void onComplete(boolean success) {
+                    if (success) {
+                        Toast.makeText(ShortcutActivity.this, R.string.status_send_success, Toast.LENGTH_SHORT).show();
+                    } else {
+                        Toast.makeText(ShortcutActivity.this, R.string.status_send_fail, Toast.LENGTH_SHORT).show();
+                    }
+                }
+            });
+
+        } else {
+            Toast.makeText(this, R.string.status_send_fail, Toast.LENGTH_SHORT).show();
         }
     }
 
+    private void checkShortcutAction(Intent intent) {
+        String action;
+        if (intent.hasExtra("shortcutAction")) {
+            action = intent.getBooleanExtra("shortcutAction", false)
+                    ? EXTRA_ACTION_START : EXTRA_ACTION_STOP;
+        } else {
+            action = intent.getStringExtra(EXTRA_ACTION);
+        }
+        switch (action) {
+            case EXTRA_ACTION_START:
+                PreferenceManager.getDefaultSharedPreferences(this)
+                        .edit().putBoolean(MainActivity.KEY_STATUS, true).commit();
+                startService(new Intent(this, TrackingService.class));
+                Toast.makeText(this, R.string.status_service_create, Toast.LENGTH_SHORT).show();
+                break;
+            case EXTRA_ACTION_STOP:
+                PreferenceManager.getDefaultSharedPreferences(this)
+                        .edit().putBoolean(MainActivity.KEY_STATUS, false).commit();
+                stopService(new Intent(this, TrackingService.class));
+                Toast.makeText(this, R.string.status_service_destroy, Toast.LENGTH_SHORT).show();
+                break;
+            case EXTRA_ACTION_SOS:
+                sendAlarm();
+                break;
+        }
+        finish();
+    }
+
 }

app/src/main/java/org/traccar/client/SimplePositionProvider.java

@@ -20,7 +20,9 @@ import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
+import android.util.Log;
 
+@SuppressWarnings("MissingPermission")
 public class SimplePositionProvider extends PositionProvider implements LocationListener {
 
     public SimplePositionProvider(Context context, PositionListener listener) {
@@ -31,7 +33,11 @@ public class SimplePositionProvider extends PositionProvider implements Location
     }
 
     public void startUpdates() {
-        locationManager.requestLocationUpdates(type, period, 0, this);
+        try {
+            locationManager.requestLocationUpdates(type, period, 0, this);
+        } catch (IllegalArgumentException e) {
+            Log.w(TAG, e);
+        }
     }
 
     public void stopUpdates() {

app/src/main/java/org/traccar/client/TrackingController.java

@@ -27,7 +27,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
 
     private static final String TAG = TrackingController.class.getSimpleName();
     private static final int RETRY_DELAY = 30 * 1000;
-    private static final int WAKE_LOCK_TIMEOUT = 60 * 1000;
+    private static final int WAKE_LOCK_TIMEOUT = 120 * 1000;
 
     private boolean isOnline;
     private boolean isWaiting;
@@ -38,6 +38,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
 
     private String address;
     private int port;
+    private boolean secure;
 
     private PositionProvider positionProvider;
     private DatabaseHelper databaseHelper;
@@ -63,7 +64,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
         this.context = context;
         handler = new Handler();
         preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        if (preferences.getString(MainActivity.KEY_PROVIDER, null).equals("mixed")) {
+        if (preferences.getString(MainActivity.KEY_PROVIDER, "gps").equals("mixed")) {
             positionProvider = new MixedPositionProvider(context, this);
         } else {
             positionProvider = new SimplePositionProvider(context, this);
@@ -74,6 +75,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
 
         address = preferences.getString(MainActivity.KEY_ADDRESS, null);
         port = Integer.parseInt(preferences.getString(MainActivity.KEY_PORT, null));
+        secure = preferences.getBoolean(MainActivity.KEY_SECURE, false);
 
         PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
         wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
@@ -197,7 +199,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
     private void send(final Position position) {
         log("send", position);
         lock();
-        String request = ProtocolFormatter.formatRequest(address, port, position);
+        String request = ProtocolFormatter.formatRequest(address, port, secure, position);
         RequestManager.sendRequestAsync(request, new RequestManager.RequestHandler() {
             @Override
             public void onComplete(boolean success) {

app/src/main/java/org/traccar/client/TrackingService.java

@@ -23,7 +23,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.IBinder;
-import android.preference.PreferenceManager;
 import android.util.Log;
 
 import java.lang.reflect.InvocationTargetException;

app/src/main/res/values-ar/strings.xml

@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">عميل Traccar</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - بدء</string>
+  <string name="shortcut_stop">Traccar - إيقاف</string>
+  <string name="settings_id_title">معرف الجهاز</string>
+  <string name="settings_address_title">عنوان الخادم</string>
+  <string name="settings_address_summary">اسم النطاق أو عنوان بروتوكول الإنترنت</string>
+  <string name="settings_port_title">منفذ الخادم</string>
+  <string name="settings_port_summary">تعقب منفذ خادم تي سي بي</string>
+  <string name="settings_interval_title">تردد</string>
+  <string name="settings_interval_summary">فترة الرسائل بالثواني</string>
+  <string name="settings_status_title">حالة الخدمة</string>
+  <string name="settings_status_off">بدء</string>
+  <string name="settings_status_on">إيقاف</string>
+  <string name="settings_status_off_summary">الخدمة توقفت</string>
+  <string name="settings_status_on_summary">الخدمة تعمل</string>
+  <string name="settings_provider_title">موفر الموقع</string>
+  <string name="settings_provider_summary">مصدر بيانات الموقع</string>
+  <string name="settings_provider_gps">موفر نظام تحديد الموقع</string>
+  <string name="settings_provider_network">موفر الشبكة</string>
+  <string name="settings_provider_mixed">موفر المختلط</string>
+  <string name="settings_foreground_title">الخدمة الأمامية</string>
+  <string name="settings_foreground_summary">زيادة أولوية الخدمة</string>
+  <string name="menu_status">الحالة</string>
+  <string name="menu_about">حول</string>
+  <string name="menu_shortcuts">إضافة اختصارات</string>
+  <string name="menu_clear">مسح</string>
+  <string name="about_description">محدد الموقع في الوقت الفعلي لأجهزة Android. متوافق مع خادم Traccar ونظم تعقب أخرى </string>
+  <string name="about_license">هذا التطبيق مجاني ومفتوح المصدر، الكود المصدري مرخص تحت رخصة Apache الإصدار 2.0 و متاح على GitHub.</string>
+  <string name="about_web">لمزيد من المعلومات زر \nwww.traccar.org/client</string>
+  <string name="status_service_create">تم إنشاء الخدمة</string>
+  <string name="status_service_destroy">تم تدمير الخدمة</string>
+  <string name="status_send_fail">فشل الإرسال</string>
+  <string name="status_location_update">تحديث الموقع</string>
+  <string name="status_connectivity_change">تغير الارتباط</string>
+  <string name="hidden_app_name">إعدادات الجهاز</string>
+  <string name="hidden_alert">تم إخفاء التطبيق. لفتحه مجددا رجاءا اتصل بـ8722227 (TRACCAR).</string>
+</resources>

app/src/main/res/values-bg/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar Client</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar -Старт</string>
+  <string name="shortcut_stop">Traccar - Стоп</string>
+  <string name="settings_id_title">Идентификатор</string>
+  <string name="settings_address_title">Адрес на сървъра</string>
+  <string name="settings_address_summary">Име на домейн или IP адрес</string>
+  <string name="settings_port_title">Порт на сървъра</string>
+  <string name="settings_port_summary">Tracking server TCP port</string>
+  <string name="settings_interval_title">Честота</string>
+  <string name="settings_interval_summary">Интервал на координатите в сек.</string>
+  <string name="settings_status_title">Състояние на услугата</string>
+  <string name="settings_status_off">Старт</string>
+  <string name="settings_status_on">Стоп</string>
+  <string name="settings_status_off_summary">Услугата е спряна</string>
+  <string name="settings_status_on_summary">Услугата работи</string>
+  <string name="settings_secure_title">Шифроване</string>
+  <string name="settings_secure_off">Активиране</string>
+  <string name="settings_secure_on">Деактивиране</string>
+  <string name="settings_secure_off_summary">Шифроване изкл.</string>
+  <string name="settings_secure_on_summary">Шифроване вкл.</string>
+  <string name="settings_provider_title">Доставчик на местоположение</string>
+  <string name="settings_provider_summary">Източник на данни за местоположението</string>
+  <string name="settings_provider_gps">GPS</string>
+  <string name="settings_provider_network">Мрежи</string>
+  <string name="settings_provider_mixed">Смесен Доставчик</string>
+  <string name="settings_foreground_title">Foreground service</string>
+  <string name="settings_foreground_summary">Увеличаване на приоритета на услугата</string>
+  <string name="menu_status">Състояние</string>
+  <string name="menu_about">About</string>
+  <string name="menu_shortcuts">Добави пряк път</string>
+  <string name="menu_clear">Изтрий</string>
+  <string name="about_description">Real time GPS tracker for Android devices. Compatible with Traccar Server and other tracking systems.</string>
+  <string name="about_license">This application is free and open source, source code is licensed under Apache License Version 2.0 and available on GitHub.</string>
+  <string name="about_web">For more information visit\nwww.traccar.org/client</string>
+  <string name="status_service_create">Услугата е създадена</string>
+  <string name="status_service_destroy">Услугата е премахната</string>
+  <string name="status_send_fail">Грешка в изпращането</string>
+  <string name="status_location_update">Местоположението е обновено</string>
+  <string name="status_connectivity_change">Промяна в свързването</string>
+  <string name="hidden_app_name">Настройки</string>
+  <string name="hidden_alert">The app has been hidden. To open it again please dial 8722227 (TRACCAR).</string>
+</resources>

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

@@ -2,6 +2,8 @@
 <resources>
   <string name="app_name">Traccar klient</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Spustit</string>
+  <string name="shortcut_stop">Traccar - Zastavit</string>
   <string name="settings_id_title">Identifikátor zařízení</string>
   <string name="settings_address_title">Adresa serveru</string>
   <string name="settings_address_summary">Doménové jméno nebo IP adresa</string>
@@ -14,6 +16,11 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Zastaveno</string>
   <string name="settings_status_on_summary">Spuštěno</string>
+  <string name="settings_secure_title">Šifrování</string>
+  <string name="settings_secure_off">Povolit</string>
+  <string name="settings_secure_on">Zakázat</string>
+  <string name="settings_secure_off_summary">Šifrování zakázáno</string>
+  <string name="settings_secure_on_summary">Šifrování povoleno</string>
   <string name="settings_provider_title">Poskytovatel zaměření</string>
   <string name="settings_provider_summary">Zdroj zaměřovacích dat</string>
   <string name="settings_provider_gps">GPS</string>
@@ -23,6 +30,7 @@
   <string name="settings_foreground_summary">Zvýšit prioritu služba</string>
   <string name="menu_status">Stav</string>
   <string name="menu_about">O aplikaci</string>
+  <string name="menu_shortcuts">Přidat zástupce</string>
   <string name="menu_clear">Vyčistit</string>
   <string name="about_description">GPS sledovací aplikace pracující v reálném čase pro zařízení s operačním systémem Android. Kompatibilní s Traccar serverem a dalšími sledovacími systémy.</string>
   <string name="about_license">Tato aplikace je zdarma a open source, zdrojový kód je licencován pod Apache License Version 2.0 a je přístupný na GitHub.</string>
@@ -32,4 +40,6 @@
   <string name="status_send_fail">Odesílání selhalo</string>
   <string name="status_location_update">Aktualizace pozice</string>
   <string name="status_connectivity_change">Změna připojení</string>
+  <string name="hidden_app_name">Nastavení zařízení</string>
+  <string name="hidden_alert">Aplikace byla skryta. Pro znovuotevření vytočte 8722227 (TRACCAR)</string>
 </resources>

app/src/main/res/values-da/strings.xml

@@ -2,6 +2,8 @@
 <resources>
   <string name="app_name">Traccar klient</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Start</string>
+  <string name="shortcut_stop">Traccar - Stop</string>
   <string name="settings_id_title">Indentificere Enhed</string>
   <string name="settings_address_title">Server adresse</string>
   <string name="settings_address_summary">Domænenavn eller IP adresse</string>
@@ -23,6 +25,7 @@
   <string name="settings_foreground_summary">Øg tjeneste prioritet</string>
   <string name="menu_status">Status</string>
   <string name="menu_about">Om</string>
+  <string name="menu_shortcuts">Tilføj genveje</string>
   <string name="menu_clear">Tilbage</string>
   <string name="about_description">Real tid`s GPS tracker for Android enheder. Kompatibel med Traccar Server og andre tracking systemer.</string>
   <string name="about_license">Denne application er en fri og open source, source koden er licenseret under Apache License Version 2.0 og tilgængelig på GitHub.</string>
@@ -32,4 +35,6 @@
   <string name="status_send_fail">Send fejl</string>
   <string name="status_location_update">Placering opdateret</string>
   <string name="status_connectivity_change">Connectivity forandring</string>
+  <string name="hidden_app_name">Enheds indstillinger</string>
+  <string name="hidden_alert">Appen er skjult. For at åbne appen igen skal du ringe til 8722227 (TRACCAR)</string>
 </resources>

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

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Traccar für Android</string>
+  <string name="app_name">Traccar Klient</string>
   <string name="app_logo">Traccar</string>
   <string name="shortcut_start">Traccar - Start</string>
   <string name="shortcut_stop">Traccar - Stop</string>
@@ -16,6 +16,11 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Dienst inaktiv</string>
   <string name="settings_status_on_summary">Dienst aktiv</string>
+  <string name="settings_secure_title">Verschlüsselung</string>
+  <string name="settings_secure_off">Aktivieren</string>
+  <string name="settings_secure_on">Deaktivieren</string>
+  <string name="settings_secure_off_summary">Verschlüsselung aktiviert </string>
+  <string name="settings_secure_on_summary">Verschlüsselung deaktiviert</string>
   <string name="settings_provider_title">Datenherkunft</string>
   <string name="settings_provider_summary">Quelle der Positionen</string>
   <string name="settings_provider_gps">GPS</string>

app/src/main/res/values-el/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">πελάτης Traccar</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Εκκίνηση</string>
+  <string name="shortcut_stop">Traccar - Παύση</string>
+  <string name="settings_id_title">Αναγνωριστικό συσκευής</string>
+  <string name="settings_address_title">Διεύθυνση εξυπηρετητή</string>
+  <string name="settings_address_summary">Όνομα χώρου ή διεύθυνση δικτύου</string>
+  <string name="settings_port_title">Θύρα εξυπηρετητή</string>
+  <string name="settings_port_summary">TCP θύρα εξυπηρετητή</string>
+  <string name="settings_interval_title">Συχνότητα</string>
+  <string name="settings_interval_summary">Διάστημα μηνυμάτων σε δευτεόλεπτα</string>
+  <string name="settings_status_title">Κατάσταση υπηρεσίας</string>
+  <string name="settings_status_off">Εκκίνηση</string>
+  <string name="settings_status_on">Παύση</string>
+  <string name="settings_status_off_summary">Η υπηρεσία σταμάτησε</string>
+  <string name="settings_status_on_summary">Η υπηρεσία εκτελείται</string>
+  <string name="settings_secure_title">Kρυπτογράφηση</string>
+  <string name="settings_secure_off">Ενεργοποίηση</string>
+  <string name="settings_secure_on">Απενεργοποίηση</string>
+  <string name="settings_secure_off_summary">Η κρυπτογράφηση απενεργοποιήθηκε</string>
+  <string name="settings_secure_on_summary">Η κρυπτογράφηση ενεργοποιήθηκε</string>
+  <string name="settings_provider_title">Παροχέας τοποθεσίας</string>
+  <string name="settings_provider_summary">Πηγή δεδομένων τοποθεσίας</string>
+  <string name="settings_provider_gps">Παροχή GPS</string>
+  <string name="settings_provider_network">Παροχή δικτύου</string>
+  <string name="settings_provider_mixed">Μεικτή παροχή</string>
+  <string name="settings_foreground_title">Υπηρεσία προσκηνίου</string>
+  <string name="settings_foreground_summary">Αύξηση προτεραιότητας της υπηρεσίας</string>
+  <string name="menu_status">Κατάσταση</string>
+  <string name="menu_about">Περί</string>
+  <string name="menu_shortcuts">Προσθήκη συντόμευσης</string>
+  <string name="menu_clear">Καθαρισμός</string>
+  <string name="about_description">GPS ιχνηλάτης πραγματικού χρόνου για συσκευές Android. Συμβατός με Traccar και άλλα συστήματα ιχνηλάτησης.</string>
+  <string name="about_license">Εφαρμογή Ελεύθερου και Ανοικτού κώδικα. Ο πηγαίος κώδικας παρέχεται με άδεια Apache 2.0 και διατίθεται στο GitHub.</string>
+  <string name="about_web">Για περισσότερες πληροφορίες επισκεφτείτε\nwww.traccar.org/client</string>
+  <string name="status_service_create">Η υπηρεσία δημιουργήθηκε</string>
+  <string name="status_service_destroy">Η υπηρεσία διαγράφηκε</string>
+  <string name="status_send_fail">Αποτυχημένη αποστολή</string>
+  <string name="status_location_update">Ενημέρωση τοποθεσίας</string>
+  <string name="status_connectivity_change">Αλλαγή στη διασύνδεση</string>
+  <string name="hidden_app_name">Ρυθμίσεις συσκευής</string>
+  <string name="hidden_alert">Η εφαρμογή αποκρύφτηκε. Για να προβληθεί καλέστε 8722227 (TRACCAR)</string>
+</resources>

app/src/main/res/values-es/strings.xml

@@ -2,18 +2,25 @@
 <resources>
   <string name="app_name">Cliente Traccar</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Iniciar</string>
+  <string name="shortcut_stop">Traccar - Detener</string>
   <string name="settings_id_title">Identificador de Dispositivo</string>
-  <string name="settings_address_title">Dirección Servidor</string>
+  <string name="settings_address_title">Dirección del Servidor</string>
   <string name="settings_address_summary">Dominio o Dirección IP</string>
   <string name="settings_port_title">Puerto del Servidor</string>
-  <string name="settings_port_summary">Puerto TCP del rastreador</string>
+  <string name="settings_port_summary">Puerto TCP del servidor de rastreo</string>
   <string name="settings_interval_title">Frecuencia de rastreo</string>
   <string name="settings_interval_summary">Intervalo de los mensajes, en segundos</string>
   <string name="settings_status_title">Estado del servicio</string>
   <string name="settings_status_off">Activado</string>
   <string name="settings_status_on">Desactivado</string>
-  <string name="settings_status_off_summary">Servicio parado</string>
+  <string name="settings_status_off_summary">Servicio detenido</string>
   <string name="settings_status_on_summary">Servicio activado</string>
+  <string name="settings_secure_title">Encriptación</string>
+  <string name="settings_secure_off">Habilitar</string>
+  <string name="settings_secure_on">Deshabilitar</string>
+  <string name="settings_secure_off_summary">Encriptación deshabilitada</string>
+  <string name="settings_secure_on_summary">Encriptación habilitada</string>
   <string name="settings_provider_title">Proveedor de localización</string>
   <string name="settings_provider_summary">Fuente de los datos de localización</string>
   <string name="settings_provider_gps">Proveedor GPS</string>
@@ -23,13 +30,17 @@
   <string name="settings_foreground_summary">Aumentar prioridad de servicio</string>
   <string name="menu_status">Estado</string>
   <string name="menu_about">Acerca de…</string>
+  <string name="menu_shortcuts">Añadir acceso directo</string>
   <string name="menu_clear">Limpiar</string>
-  <string name="about_description">Rastreador GPS en tiempo real para dispositivos Android. Compatible con Servidore Traccar y otros sistemas de rastreo.</string>
-  <string name="about_license">Esta aplición es gratuíta y de código abierto. El código fuente está sometido a Licencia Apache Versión 2 y disponible en Github.</string>
-  <string name="about_web">Para más información visite\nwww.traccar.org/client</string>
+  <string name="about_description">Rastreador GPS en tiempo real para dispositivos Android. Compatible con Servidor Traccar y otros sistemas de rastreo.</string>
+  <string name="about_license">Esta aplición es gratuíta y de código abierto. El código fuente está bajo la Licencia Apache Versión 2 y disponible en Github.</string>
+  <string name="about_web">Para más información visite
+www.traccar.org/client</string>
   <string name="status_service_create">Servicio creado</string>
-  <string name="status_service_destroy">Servicio destruído</string>
+  <string name="status_service_destroy">Servicio eliminado</string>
   <string name="status_send_fail">Error en el envío</string>
-  <string name="status_location_update">Posición actualizada</string>
-  <string name="status_connectivity_change">Cambio conectividad</string>
+  <string name="status_location_update">Actualización de Posición</string>
+  <string name="status_connectivity_change">Cambio en la conectividad</string>
+  <string name="hidden_app_name">Ajustes del Dispositivo</string>
+  <string name="hidden_alert">La app se ha ocultado. Para abrirla de nuevo por favor marque 8722227 (TRACCAR).</string>
 </resources>

app/src/main/res/values-fi/strings.xml

@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar Client</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Aloita</string>
+  <string name="shortcut_stop">Traccar - Lopeta</string>
+  <string name="settings_id_title">Laitteen tunniste</string>
+  <string name="settings_address_title">Palvelimen osoite</string>
+  <string name="settings_address_summary">Domain tai ip-osoite</string>
+  <string name="settings_port_title">Serverin portti</string>
+  <string name="settings_port_summary">Jäljityspalvelimen TCP-portti</string>
+  <string name="settings_interval_title">Taajuus</string>
+  <string name="settings_interval_summary">Viestien aikaväli sekunneissa</string>
+  <string name="settings_status_title">Palvelun tila</string>
+  <string name="settings_status_off">Aloita</string>
+  <string name="settings_status_on">Pysäytä</string>
+  <string name="settings_status_off_summary">Palvelu pysäytetty</string>
+  <string name="settings_status_on_summary">Palvelu käynnissä</string>
+  <string name="settings_secure_title">Salaus</string>
+  <string name="settings_secure_off">Päälle</string>
+  <string name="settings_secure_on">Pois päältä</string>
+  <string name="settings_secure_off_summary">Salaus poissa päältä</string>
+  <string name="settings_secure_on_summary">Salaus päällä</string>
+  <string name="settings_provider_title">Sijainnin tarjoaja</string>
+  <string name="settings_provider_summary">Sijaintidatan lähde</string>
+  <string name="settings_provider_gps">GPS satelliiti</string>
+  <string name="settings_provider_network">Matkapuhelinverkko</string>
+  <string name="settings_provider_mixed">Yhdistelmä</string>
+  <string name="menu_status">Tila</string>
+  <string name="menu_about">About</string>
+  <string name="menu_clear">Tyhjennä</string>
+  <string name="status_service_create">Palvelu luotu</string>
+  <string name="status_service_destroy">Palvelu tuhottu</string>
+  <string name="status_send_fail">Lähetys epäonnistui</string>
+  <string name="status_location_update">Sijainnin päivitys</string>
+  <string name="hidden_app_name">Laitteen asetukset</string>
+  <string name="hidden_alert">Sovellus on piilotettu. Näppäile 8722227 (TRACCAR) avataksesi sovelluksen uudelleen.</string>
+</resources>

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

@@ -16,6 +16,11 @@
   <string name="settings_status_on">Arrêter</string>
   <string name="settings_status_off_summary">Arrêté</string>
   <string name="settings_status_on_summary">En marche</string>
+  <string name="settings_secure_title">Encryption</string>
+  <string name="settings_secure_off">Activer</string>
+  <string name="settings_secure_on">Désactiver</string>
+  <string name="settings_secure_off_summary">Encryption désactivée</string>
+  <string name="settings_secure_on_summary">Encryption activée</string>
   <string name="settings_provider_title">Source de localisation</string>
   <string name="settings_provider_summary">Source utilisée par le système afin d\'obtenir la localisation de l\'appareil</string>
   <string name="settings_provider_gps">Mode GPS uniquement</string>

app/src/main/res/values-hi/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">ट्रैक्कार क्लाइंट </string>
+  <string name="app_logo">ट्रैक्कार</string>
+  <string name="shortcut_start">ट्रैक्कार  - आरम्भ </string>
+  <string name="shortcut_stop">ट्रैक्कार - रोकें</string>
+  <string name="settings_id_title">उपकरण पहचानकर्ता</string>
+  <string name="settings_address_title">सर्वर का पता</string>
+  <string name="settings_address_summary">डोमेन का नाम या आई पी (IP)  एड्रेस का पता</string>
+  <string name="settings_port_title">सर्वर पोर्ट</string>
+  <string name="settings_port_summary">ट्रैकिंग सर्वर का टीसीपी पोर्ट</string>
+  <string name="settings_interval_title">फ्रीक्वेंसी / आवृत्ति</string>
+  <string name="settings_interval_summary">सैकंड्स में संदेश अंतराल </string>
+  <string name="settings_status_title">सेवा की स्थिति</string>
+  <string name="settings_status_off">आरम्भ</string>
+  <string name="settings_status_on">रोकें</string>
+  <string name="settings_status_off_summary">सेवा रुक गई है</string>
+  <string name="settings_status_on_summary">सेवा चल रही है</string>
+  <string name="settings_secure_title">कूटलेखन</string>
+  <string name="settings_secure_off">सक्षम</string>
+  <string name="settings_secure_on">अक्षम</string>
+  <string name="settings_secure_off_summary">कूटलेखन अक्षम</string>
+  <string name="settings_secure_on_summary">कूटलेखन सक्षम</string>
+  <string name="settings_provider_title">जगह / स्थान / स्तिथि प्रदाता</string>
+  <string name="settings_provider_summary">जगह / स्थान / स्तिथि डेटा का स्रोत</string>
+  <string name="settings_provider_gps">जीपीएस प्रदाता</string>
+  <string name="settings_provider_network">नेटवर्क प्रदाता</string>
+  <string name="settings_provider_mixed">मिश्रित प्रदाता</string>
+  <string name="settings_foreground_title">अग्रभूमि सेवा</string>
+  <string name="settings_foreground_summary">सेवा प्राथमिकता बढ़ाएँ</string>
+  <string name="menu_status">स्थिति</string>
+  <string name="menu_about">बारे में</string>
+  <string name="menu_shortcuts">शॉर्टकट्स जोड़ें</string>
+  <string name="menu_clear">स्पष्ट /  साफ़</string>
+  <string name="about_description">एंड्रॉयड उपकरणों के लिए वास्तविक समय जीपीएस ट्रैकर। ट्रैक्कार सर्वर और अन्य  ट्रैकिंग प्रणालियों के साथ अनुकूल।</string>
+  <string name="about_license">इस एप्लिकेशन के पास स्वतंत्र और खुला स्रोत है  , स्रोत कोड अपाचे लाइसेंस संस्करण 2.0 और GitHub के अंतर्गत उपलब्ध लाइसेंस प्राप्त है ।</string>
+  <string name="about_web">अधिक जानकारी के लिए www.traccar.org/client वेबसाइट देखें </string>
+  <string name="status_service_create">सेवा का सृजन हो गया है</string>
+  <string name="status_service_destroy">सेवा को नष्ट कर दिया गया है</string>
+  <string name="status_send_fail">भेजना विफल हो गया है </string>
+  <string name="status_location_update">जगह / स्थान / स्तिथि का अद्यतन / ताजी जानकारी</string>
+  <string name="status_connectivity_change">कनेक्टिविटी / संयोजकता परिवर्तन</string>
+  <string name="hidden_app_name">उपकरण की सेटिंग्स</string>
+  <string name="hidden_alert">एप्लिकेशन को छुपा दिया गया है l इसे फिर से खोलने के लिए डायल करें 8722227 ( TRACCAR ) l</string>
+</resources>

app/src/main/res/values-hr/strings.xml

@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar klijent</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Start</string>
+  <string name="shortcut_stop">Traccar -Stop</string>
+  <string name="settings_id_title">Identifikator uređaja</string>
+  <string name="settings_address_title">Adresa poslužitelja
+</string>
+  <string name="settings_address_summary">Ime domene ili IP adresa</string>
+  <string name="settings_port_title">Broj porta poslužitelja</string>
+  <string name="settings_port_summary">TCP port poslužitelja za praćenje</string>
+  <string name="settings_interval_title">Učestalost</string>
+  <string name="settings_interval_summary">Interval poruka u sekundama</string>
+  <string name="settings_status_title">Status servisa</string>
+  <string name="settings_status_off">Start</string>
+  <string name="settings_status_on">Stop</string>
+  <string name="settings_status_off_summary">Servis zaustavljen</string>
+  <string name="settings_status_on_summary">Servis pokrenut</string>
+  <string name="settings_provider_title">Pružatelj usluge lokacija</string>
+  <string name="settings_provider_summary">Izvor podataka o lokaciji</string>
+  <string name="settings_provider_gps">GPS pružatelj usluge</string>
+  <string name="settings_provider_network">Mrežni pružatelj usluge</string>
+  <string name="settings_provider_mixed">Mješani pružatelj usluge</string>
+  <string name="settings_foreground_title">Predhodna usluga</string>
+  <string name="settings_foreground_summary">Povećanje prioriteta usluge</string>
+  <string name="menu_status">Status</string>
+  <string name="menu_about">O nama</string>
+  <string name="menu_shortcuts">Dodaj prečace</string>
+  <string name="menu_clear">Očisti</string>
+  <string name="about_description">GPS praćenje u stvarnom vremenu za Android uređaje. Kompatibilno sa Traccar Server i drugim sustavima za praćenje.</string>
+  <string name="about_license">Ova aplikacija je besplatna i iz otvorenog izvora, izvorni kod je zaštićen Apache Licencom verzija 2.0 i dostupna na GitHub.</string>
+  <string name="about_web">Za više informacija posjetite www.traccar.org/client</string>
+  <string name="status_service_create">Kreator usluge</string>
+  <string name="status_service_destroy">Usluga uništena</string>
+  <string name="status_send_fail">Greška pri slanju</string>
+  <string name="status_location_update">Osvežavanje lokacije</string>
+  <string name="status_connectivity_change">Promjena konekcije</string>
+  <string name="hidden_app_name">Podešavanje uređaja</string>
+  <string name="hidden_alert">Aplikacija je skrivena. Za ponovno otvaranje molim nazovite  8722227 (TRACCAR).</string>
+</resources>

app/src/main/res/values-hu/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar Kliens</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Indítás</string>
+  <string name="shortcut_stop">Traccar - Megállítás</string>
+  <string name="settings_id_title">Eszközazonosító</string>
+  <string name="settings_address_title">Szervercím</string>
+  <string name="settings_address_summary">Domainnév vagy IP-cím</string>
+  <string name="settings_port_title">Szerver port</string>
+  <string name="settings_port_summary">Követő szerver TCP portja</string>
+  <string name="settings_interval_title">Frekvencia</string>
+  <string name="settings_interval_summary">Üzenetküldési intervallum másodpercben</string>
+  <string name="settings_status_title">Szolgáltatás státusza</string>
+  <string name="settings_status_off">Indítás</string>
+  <string name="settings_status_on">Megállítás</string>
+  <string name="settings_status_off_summary">Szolgáltatás megállítva</string>
+  <string name="settings_status_on_summary">Szolgáltatás elindítva</string>
+  <string name="settings_secure_title">Titkosítás</string>
+  <string name="settings_secure_off">Engedélyezés</string>
+  <string name="settings_secure_on">Tiltás</string>
+  <string name="settings_secure_off_summary">Titkosítás letiltva</string>
+  <string name="settings_secure_on_summary">Titkosítás engedélyezve</string>
+  <string name="settings_provider_title">Pozíciós szolgáltató</string>
+  <string name="settings_provider_summary">Pozíciós adatok forrása</string>
+  <string name="settings_provider_gps">GPS szolgáltató</string>
+  <string name="settings_provider_network">Hálózati szolgáltató</string>
+  <string name="settings_provider_mixed">Kevert szolgáltató</string>
+  <string name="settings_foreground_title">Előtér szolgáltatás</string>
+  <string name="settings_foreground_summary">Szolgáltatás prioritásának emelése</string>
+  <string name="menu_status">Státusz</string>
+  <string name="menu_about">Névjegy</string>
+  <string name="menu_shortcuts">Parancsikon hozzáadása</string>
+  <string name="menu_clear">Töröl</string>
+  <string name="about_description">Valós idejű GPS követő Android eszközökre. Kompatibilis többek közt a Traccar Szerverrel és egyéb követő rendszerekkel is.</string>
+  <string name="about_license">Ez az applikáció ingyenes és nyílt forrású, forráskódja az Apache License 2.0 licenccel rendelkezik és elérhető a GitHub-on.</string>
+  <string name="about_web">További információkért látogass el az alábbi weboldalra\nwww.traccar.org/client</string>
+  <string name="status_service_create">Szolgáltatás létrehozva</string>
+  <string name="status_service_destroy">Szolgáltatás megsemmisítve</string>
+  <string name="status_send_fail">Küldés sikertelen</string>
+  <string name="status_location_update">Pozíció frissítés</string>
+  <string name="status_connectivity_change">Kapcsolódás módosítása</string>
+  <string name="hidden_app_name">Eszköz beállítások</string>
+  <string name="hidden_alert">Ez az applikáció el lett rejtve. Megnyitásához  kérjük hívja a 8722227 (TRACCAR) telefonszámot.</string>
+</resources>

app/src/main/res/values-it/strings.xml

@@ -2,9 +2,11 @@
 <resources>
   <string name="app_name">Traccar Client</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Start</string>
+  <string name="shortcut_stop">Traccar - Stop</string>
   <string name="settings_id_title">Identificativo dispositivo</string>
-  <string name="settings_address_title">Indrizzo server</string>
-  <string name="settings_address_summary">Nome del dominio o indizzo IP</string>
+  <string name="settings_address_title">Indirizzo server</string>
+  <string name="settings_address_summary">Nome del dominio o indirizzo IP</string>
   <string name="settings_port_title">Porta server</string>
   <string name="settings_port_summary">Porta TCP del Tracking server</string>
   <string name="settings_interval_title">Frequenza</string>
@@ -12,20 +14,26 @@
   <string name="settings_status_title">Stato del servizio</string>
   <string name="settings_status_off">Start</string>
   <string name="settings_status_on">Stop</string>
-  <string name="settings_status_off_summary">Servizio arrestatto</string>
+  <string name="settings_status_off_summary">Servizio arrestato</string>
   <string name="settings_status_on_summary">Servizio avviato</string>
-  <string name="settings_provider_title">Posizione provider</string>
-  <string name="settings_provider_summary">Sorgente dei dati di localizzazione</string>
-  <string name="settings_provider_gps">GPS provider</string>
-  <string name="settings_provider_network">Network provider</string>
-  <string name="settings_provider_mixed">Mixed provider</string>
-  <string name="settings_foreground_title">Foreground service</string>
-  <string name="settings_foreground_summary">Aumenta la priorita` del servizio</string>
+  <string name="settings_secure_title">Crittografia</string>
+  <string name="settings_secure_off">Abilita</string>
+  <string name="settings_secure_on">Disabilita</string>
+  <string name="settings_secure_off_summary">Disabilita crittografia</string>
+  <string name="settings_secure_on_summary">Abilita crittografia</string>
+  <string name="settings_provider_title">Provider posizione</string>
+  <string name="settings_provider_summary">Fonte dei dati di localizzazione</string>
+  <string name="settings_provider_gps">Provider GPS</string>
+  <string name="settings_provider_network">Provider di rete</string>
+  <string name="settings_provider_mixed">Provider misto</string>
+  <string name="settings_foreground_title">Servizio in primo piano</string>
+  <string name="settings_foreground_summary">Aumenta la priorità del servizio</string>
   <string name="menu_status">Stato</string>
-  <string name="menu_about">About</string>
-  <string name="menu_clear">Pulisici</string>
+  <string name="menu_about">Info</string>
+  <string name="menu_shortcuts">Aggiungi scorciatoia</string>
+  <string name="menu_clear">Pulisci</string>
   <string name="about_description">Real time GPS tracker per dispositivi Android. Compatibile con Traccar Server e altri sistemi di tracking.</string>
-  <string name="about_license">Questa applicazione e` gratuita e open source, il codice sorgente e` sotto licenza Apache License Version 2.0 e disponibile su GitHub.</string>
+  <string name="about_license">Questa applicazione è libera e open source, il codice sorgente è sotto licenza Apache License Version 2.0 e disponibile su GitHub.</string>
   <string name="about_web">Per maggiori informazioni visitate \nwww.traccar.org/client</string>
   <string name="status_service_create">Servizio creato</string>
   <string name="status_service_destroy">Servizio distrutto</string>
@@ -33,5 +41,5 @@
   <string name="status_location_update">Aggiornamento posizione</string>
   <string name="status_connectivity_change">Connessione cambiata</string>
   <string name="hidden_app_name">Impostazioni dispositivo</string>
-  <string name="hidden_alert">La app e` stata nascosta. Per aprirla nuovamente digita 8722227 (TRACCAR).</string>
+  <string name="hidden_alert">La app è stata nascosta. Per aprirla nuovamente digita 8722227 (TRACCAR).</string>
 </resources>

app/src/main/res/values-lo/strings.xml

@@ -2,20 +2,25 @@
 <resources>
   <string name="app_name">ລາວຈີພີເອສ໌ຄາຣ໌</string>
   <string name="app_logo">ລາວຈີພີເອສ໌ຄາຣ໌</string>
-  <string name="shortcut_start">ລາວຈີພີເອສ໌ຄາຣ໌ - ເລີ່ມຕົ້ນ</string>
-  <string name="shortcut_stop">ລາວຈີພີເອສ໌ຄາຣ໌ - ຢຸດ</string>
+  <string name="shortcut_start">ລາວຈີພີເອສ໌ຄາຣ໌ - ເລີ່ມໃຊ້ງານ</string>
+  <string name="shortcut_stop">ລາວຈີພີເອສ໌ຄາຣ໌ - ຢຸດໃຊ້ງານ</string>
   <string name="settings_id_title">ໝາຍເລກອຸປະກອນ</string>
   <string name="settings_address_title">ທີ່ຢູ່ຂອງເຊີເວີ້</string>
   <string name="settings_address_summary">ໂດເມນເນມຫລື້ທີ່ຢູ່ໄອພີ</string>
   <string name="settings_port_title">ພອດເຊີເວີ້</string>
   <string name="settings_port_summary">ພອດ TCP ການຕິດຕາມເຊີເວີ້</string>
-  <string name="settings_interval_title">ລະດັບຄວາມຖີ່</string>
+  <string name="settings_interval_title">ຄວາມຖີ່</string>
   <string name="settings_interval_summary">ໄລຍະຫ່າງສົ່ງຂໍ້ຄວາມເປັນວິນາທີ</string>
   <string name="settings_status_title">ສະຖານະໃຊ້ງານ</string>
-  <string name="settings_status_off">ເລີ່ມ</string>
-  <string name="settings_status_on">ຢຸດ</string>
+  <string name="settings_status_off">ເລີ່ມໃຊ້ງານ</string>
+  <string name="settings_status_on">ຢຸດໃຊ້ງານ</string>
   <string name="settings_status_off_summary">ການໃຊ້ງານໄດ້ຢຸດລົງ</string>
   <string name="settings_status_on_summary">ການໃຊ້ງານກຳລັງທຳງານຢູ່</string>
+  <string name="settings_secure_title">ການເຂົ້າລະຫັດ</string>
+  <string name="settings_secure_off">ເປີດໃຊ້ງານ</string>
+  <string name="settings_secure_on">ປິດໃຊ້ງານ</string>
+  <string name="settings_secure_off_summary">ປິດການເຂົ້າລະຫັດ</string>
+  <string name="settings_secure_on_summary">ເປີດການເຂົ້າລະຫັດ</string>
   <string name="settings_provider_title">ຜູ້ໃຫ້ບໍລິການຈຸດພິກັດ</string>
   <string name="settings_provider_summary">ແຫລ່ງຂອງຂໍ້ມູນພິກັດ</string>
   <string name="settings_provider_gps">ຜູ້ໃຫ້ບໍລິການ GPS</string>
@@ -36,5 +41,5 @@
   <string name="status_location_update">ສະຖານທີ່ພິກັດໄດ້ອັບເດດ</string>
   <string name="status_connectivity_change">ການເຊື່ອມຕໍ່ມີການປ່ຽນແປງ</string>
   <string name="hidden_app_name">ການຕັ້ງຄ່າອຸປະກອນ</string>
-  <string name="hidden_alert">ແອັບໂຕນີ້ໄດ້ຖືກຊ້ອນໄວ້. ຖ້າຢາກເປີດຂຶ້ນມາອີກຄັ້ງກະລຸນາກົດໝາຍເລກ 8722227 (TRACCAR).</string>
+  <string name="hidden_alert">ແອັບໂຕນີ້ໄດ້ຖືກເຊື່ອງໄວ້. ຖ້າຢາກເປີດຂຶ້ນມາອີກຄັ້ງກະລຸນາກົດໝາຍເລກ 8722227 (TRACCAR).</string>
 </resources>

app/src/main/res/values-lt/strings.xml

@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar programėlė</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Pradėti</string>
+  <string name="shortcut_stop">Traccar - Stabdyti</string>
+  <string name="settings_id_title">Įrenginio numeris</string>
+  <string name="settings_address_title">Serveris</string>
+  <string name="settings_address_summary">Domenas arba IP adresas</string>
+  <string name="settings_port_title">Serverio prievadas</string>
+  <string name="settings_port_summary">Serverio TCP prievadas</string>
+  <string name="settings_interval_title">Dažnumas</string>
+  <string name="settings_interval_summary">Siuntimo intervalas sekundėmis</string>
+  <string name="settings_status_title">Tarnybos būklė</string>
+  <string name="settings_status_off">Pradėti</string>
+  <string name="settings_status_on">Stabdyti</string>
+  <string name="settings_status_off_summary">Tarnyba sustabdyta</string>
+  <string name="settings_status_on_summary">Tarnyba veikia</string>
+  <string name="settings_provider_title">Vietos nustatymas</string>
+  <string name="settings_provider_summary">Vietos nustatymo šaltinis</string>
+  <string name="settings_provider_gps">Įrenginio GPS</string>
+  <string name="settings_provider_network">GSM tinklas</string>
+  <string name="settings_provider_mixed">Mišrus: GSM ir GPS</string>
+  <string name="settings_foreground_title">Žeminti tarnybos prioritetą</string>
+  <string name="settings_foreground_summary">Padidinti tarnybos prioritetą</string>
+  <string name="menu_status">Būklė</string>
+  <string name="menu_about">Apie</string>
+  <string name="menu_shortcuts">Pridėti nuorodas</string>
+  <string name="menu_clear">Valyti</string>
+  <string name="about_description">GPS sekimo programėlė Android įrenginiams. Suderinta su Traccar Serveriu ir kitomis vietos nustatymo tarnybomis.</string>
+  <string name="about_license">Ši programėlė yra nemokama ir atviro kodo. Autorinės teisės yra saugomos pagal Apache Licence Version 2.0 reglamentą (pasiekiama GitHub)</string>
+  <string name="about_web">Daugiau informacijos adresu visit\nwww.traccar.org\client</string>
+  <string name="status_service_create">Tarnyba sukurta</string>
+  <string name="status_service_destroy">Tarnyba sustabdyta</string>
+  <string name="status_send_fail">Klaida siunčiant</string>
+  <string name="status_location_update">Vietos nusatymo duomenų atnaujinimas</string>
+  <string name="status_connectivity_change">Prisijungimo duomenų pasikeitimas</string>
+  <string name="hidden_app_name">Įrenginio nustatymai</string>
+  <string name="hidden_alert">Ši programėlė veikia paslėptu režimu. Norint ją atidaryti, prašau skambinti numeriu 8722227 (TRACCAR)</string>
+</resources>

app/src/main/res/values-nb/strings.xml

@@ -2,6 +2,8 @@
 <resources>
   <string name="app_name">Traccar Klient</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Start</string>
+  <string name="shortcut_stop">Traccar - Stopp</string>
   <string name="settings_id_title">Enhetsidentifikasjon</string>
   <string name="settings_address_title">Tjeneradresse</string>
   <string name="settings_address_summary">Domenenavn eller IP-adresse</string>
@@ -14,17 +16,23 @@
   <string name="settings_status_on">Stopp</string>
   <string name="settings_status_off_summary">Tjenesten stoppet</string>
   <string name="settings_status_on_summary">Tjenesten kjører</string>
+  <string name="settings_secure_title">Kryptering</string>
+  <string name="settings_secure_off">Aktiver</string>
+  <string name="settings_secure_on">Deaktiver</string>
+  <string name="settings_secure_off_summary">Krytpering deaktivert</string>
+  <string name="settings_secure_on_summary">Kryptering aktivert</string>
   <string name="settings_provider_title">Lokaliseringsleverandør</string>
   <string name="settings_provider_summary">Kilde for lokaliseringsdata</string>
   <string name="settings_provider_gps">GPS-lokalisering</string>
   <string name="settings_provider_network">Nettverkslokalisering</string>
   <string name="settings_provider_mixed">Blandet lokalisering</string>
   <string name="settings_foreground_title">Forgrunnen tjeneste</string>
-  <string name="settings_foreground_summary">Øk tjeneste prioritet</string>
+  <string name="settings_foreground_summary">Øk tjeneste-prioritet</string>
   <string name="menu_status">Status</string>
   <string name="menu_about">Om</string>
+  <string name="menu_shortcuts">Legg til snarvei</string>
   <string name="menu_clear">Tøm</string>
-  <string name="about_description">Sanntids GPS-sporing for Android-enheter. Kompatible med Traccar Server og andre sporingssystemer.</string>
+  <string name="about_description">Sanntids GPS-sporing for Android-enheter. Kompatibel med Traccar Server og andre sporingssystemer.</string>
   <string name="about_license">Dette programmet har fri og åpen kildekode; kildekoden er lisensiert under Apache License Version 2.0 og er tilgjengelig på GitHub.</string>
   <string name="about_web">For mer informasjon besøk\nwww.traccar.org/client</string>
   <string name="status_service_create">Tjeneste opprettet</string>
@@ -32,4 +40,6 @@
   <string name="status_send_fail">Sending mislyktes</string>
   <string name="status_location_update">Plassering oppdatert</string>
   <string name="status_connectivity_change">Tilkobling forandret</string>
+  <string name="hidden_app_name">Enhetsinnstillinger</string>
+  <string name="hidden_alert">App\'en har blitt gjemt. For å åpne igjen, vennligst tast (ring) 8722227 (TRACCAR).</string>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar client</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Start</string>
+  <string name="shortcut_stop">Traccar - Stop</string>
+  <string name="settings_id_title">Toestel identificator</string>
+  <string name="settings_address_title">Server adres</string>
+  <string name="settings_address_summary">Domeinnaam of IP-adres</string>
+  <string name="settings_port_title">Server poort</string>
+  <string name="settings_port_summary">Tracking server TCP poort</string>
+  <string name="settings_interval_title">Frequentie</string>
+  <string name="settings_interval_summary">Bericht interval in seconden</string>
+  <string name="settings_status_title">Server status</string>
+  <string name="settings_status_off">Start</string>
+  <string name="settings_status_on">Stop</string>
+  <string name="settings_status_off_summary">Service gestopt</string>
+  <string name="settings_status_on_summary">Service draait</string>
+  <string name="settings_secure_title">Versleuteling</string>
+  <string name="settings_secure_off">Aan</string>
+  <string name="settings_secure_on">Uit</string>
+  <string name="settings_secure_off_summary">Versleuteling uitgeschakeld</string>
+  <string name="settings_secure_on_summary">Versleuteling ingeschakeld</string>
+  <string name="settings_provider_title">Locatie provider</string>
+  <string name="settings_provider_summary">Bron van locatie data</string>
+  <string name="settings_provider_gps">GPS provider</string>
+  <string name="settings_provider_network">Netwerk provider</string>
+  <string name="settings_provider_mixed">Gecombineerde providers</string>
+  <string name="settings_foreground_title">Voorgrond service</string>
+  <string name="settings_foreground_summary">Verhoog voorrang voor service</string>
+  <string name="menu_status">Status</string>
+  <string name="menu_about">Over ons</string>
+  <string name="menu_shortcuts">Voeg snelkoppelingen toe</string>
+  <string name="menu_clear">Wis</string>
+  <string name="about_description">Real time GPS tracker voor Android apparaten. Compatibel met de Traccar server en andere tracking systemen.</string>
+  <string name="about_license">Deze toepassing is gratis en open source, de broncode is beschikbaar onder de Apache Licentie versie 2.0 op GitHub.</string>
+  <string name="about_web">Voor meer informatie bezoek\nwww.traccar.org/client</string>
+  <string name="status_service_create">Service aangemaakt</string>
+  <string name="status_service_destroy">Service gestopt</string>
+  <string name="status_send_fail">Verzenden mislukt</string>
+  <string name="status_location_update">Locatie update</string>
+  <string name="status_connectivity_change">Verbinding gewijzigd</string>
+  <string name="hidden_app_name">Toestel instellingen</string>
+  <string name="hidden_alert">De app is verborgen. Om hem opnieuw te openen bel je naar 8722227 (TRACCAR).</string>
+</resources>

app/src/main/res/values-nn/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar Client</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Start</string>
+  <string name="shortcut_stop">Traccar - Stopp</string>
+  <string name="settings_id_title">Einingsidentifikator</string>
+  <string name="settings_address_title">Tenaradresse</string>
+  <string name="settings_address_summary">Domenenamn eller IP-adresse</string>
+  <string name="settings_port_title">Tenarport</string>
+  <string name="settings_port_summary">TCP-port for sporingstenar</string>
+  <string name="settings_interval_title">Frekvens</string>
+  <string name="settings_interval_summary">Beskjedintervall i sekundar</string>
+  <string name="settings_status_title">Tenarstatus</string>
+  <string name="settings_status_off">Start</string>
+  <string name="settings_status_on">Stopp</string>
+  <string name="settings_status_off_summary">Teneste stoppa</string>
+  <string name="settings_status_on_summary">Tenar køyrer</string>
+  <string name="settings_secure_title">Kryptering</string>
+  <string name="settings_secure_off">Akiver</string>
+  <string name="settings_secure_on">Deaktiver</string>
+  <string name="settings_secure_off_summary">Kryptering deaktivert</string>
+  <string name="settings_secure_on_summary">Kryptering aktivert</string>
+  <string name="settings_provider_title">Lokaliseringsleverandør</string>
+  <string name="settings_provider_summary">Kilde for lokaliseringsdata</string>
+  <string name="settings_provider_gps">GPS-lokalisering</string>
+  <string name="settings_provider_network">Nettverkslokalisering</string>
+  <string name="settings_provider_mixed">Blanda lokalisering</string>
+  <string name="settings_foreground_title">Forgrunnsteneste</string>
+  <string name="settings_foreground_summary">Auk teneste-prioritet</string>
+  <string name="menu_status">Status</string>
+  <string name="menu_about">Om</string>
+  <string name="menu_shortcuts">Legg til snarveg</string>
+  <string name="menu_clear">Nullstill</string>
+  <string name="about_description">Sanntids GPS-sporing for Android-einingar. Kompatibel med Traccar Server og andre sporingssystem</string>
+  <string name="about_license">Dette programmet har fri og åpen kildekode; kildekoden er lisensiert under Apache License Version 2.0 og er tilgjengeleg på GitHub.</string>
+  <string name="about_web">For meir informasjon besøk\nwww.traccar.org/client</string>
+  <string name="status_service_create">Teneste oppretta</string>
+  <string name="status_service_destroy">Teneste øydelagd</string>
+  <string name="status_send_fail">Sending feila</string>
+  <string name="status_location_update">Plassering oppdatert</string>
+  <string name="status_connectivity_change">Tilkopling forandra</string>
+  <string name="hidden_app_name">Einingsinnstillingar</string>
+  <string name="hidden_alert">App\'en har blitt gøymt. For å åpne han igjen, ver venleg å tast (ring) 8722227 (TRACCAR).</string>
+</resources>

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

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Klient Traccar</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Start</string>
+  <string name="shortcut_stop">Traccar - Stop</string>
+  <string name="settings_id_title">Identyfikator urządzenia</string>
+  <string name="settings_address_title">Adres serwera</string>
+  <string name="settings_address_summary">Domena lub adres IP</string>
+  <string name="settings_port_title">Port serwera</string>
+  <string name="settings_port_summary">Port TCP serwera śledzącego</string>
+  <string name="settings_interval_title">Częstotliwość</string>
+  <string name="settings_interval_summary">Odstęp między wiadomościami w sekundach</string>
+  <string name="settings_status_title">Status usługi</string>
+  <string name="settings_status_off">Uruchomiona</string>
+  <string name="settings_status_on">Zatrzymana</string>
+  <string name="settings_status_off_summary">Usługa zatrzymana</string>
+  <string name="settings_status_on_summary">Usługa uruchomiona</string>
+  <string name="settings_secure_title">Szyfrowanie</string>
+  <string name="settings_secure_off">Włącz</string>
+  <string name="settings_secure_on">Wyłącz</string>
+  <string name="settings_secure_off_summary">Szyfrowanie wyłączone</string>
+  <string name="settings_secure_on_summary">Szyfrowanie włączone</string>
+  <string name="settings_provider_title">Dostawca lokalizacji</string>
+  <string name="settings_provider_summary">Źródło danych o lokalizacji</string>
+  <string name="settings_provider_gps">GPS</string>
+  <string name="settings_provider_network">Sieć</string>
+  <string name="settings_provider_mixed">Mieszane</string>
+  <string name="settings_foreground_title">Usługa pierwszoplanowa</string>
+  <string name="settings_foreground_summary">Zwiększ priorytet usługi</string>
+  <string name="menu_status">Status</string>
+  <string name="menu_about">O Traccar</string>
+  <string name="menu_shortcuts">Dodaj skróty</string>
+  <string name="menu_clear">Wyczyść</string>
+  <string name="about_description">Monitor GPS dla urządzeń Android. Kompatybilny z serwerem Traccar oraz innymi platformami śledzącymi.</string>
+  <string name="about_license">Ta aplikacja jest darmowa i otwartoźródłowa. Kod źródłowy jest licencjonowany Apache License Version 2.0 i jest dostępny na GitHub.</string>
+  <string name="about_web">Więcej informacji - odwiedź\nwww.traccar.org/client</string>
+  <string name="status_service_create">Utworzono usługę</string>
+  <string name="status_service_destroy">Usunięto usługę</string>
+  <string name="status_send_fail">Wysyłka nieudana</string>
+  <string name="status_location_update">Aktualizacja lokalizacji</string>
+  <string name="status_connectivity_change">Zmiana połączenia</string>
+  <string name="hidden_app_name">Ustawienia urządzenia</string>
+  <string name="hidden_alert">Aplikacja została ukryta. By ją otworzyć, zadzwoń na 8722227 (TRACCAR).</string>
+</resources>

app/src/main/res/values-pt/strings.xml

@@ -2,11 +2,13 @@
 <resources>
   <string name="app_name">Cliente Traccar</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Iniciar</string>
+  <string name="shortcut_stop">Traccar - Parar</string>
   <string name="settings_id_title">Identificador único</string>
   <string name="settings_address_title">Endereço do servidor</string>
   <string name="settings_address_summary">Nome do domínio ou endereço IP</string>
   <string name="settings_port_title">Porta do servidor</string>
-  <string name="settings_port_summary">Porta TCP do servidor de rastreamento</string>
+  <string name="settings_port_summary">Porta TCP do servidor de monitorização</string>
   <string name="settings_interval_title">Invervalo</string>
   <string name="settings_interval_summary">Intervalo entre as mensagens em segundos</string>
   <string name="settings_status_title">Status do Serviço</string>
@@ -14,6 +16,11 @@
   <string name="settings_status_on">Parar</string>
   <string name="settings_status_off_summary">Serviço Parado</string>
   <string name="settings_status_on_summary">Serviço em execução</string>
+  <string name="settings_secure_title">Encriptação</string>
+  <string name="settings_secure_off">Activado</string>
+  <string name="settings_secure_on">Desactivado</string>
+  <string name="settings_secure_off_summary">Encriptação desactivada</string>
+  <string name="settings_secure_on_summary">Encriptação activada</string>
   <string name="settings_provider_title">Provedor de localização</string>
   <string name="settings_provider_summary">Fonte dos dados de localização</string>
   <string name="settings_provider_gps">Provedor GPS</string>
@@ -21,15 +28,18 @@
   <string name="settings_provider_mixed">Provedor Misto</string>
   <string name="settings_foreground_title">Serviço primeiro plano</string>
   <string name="settings_foreground_summary">Aumentar a prioridade de serviço</string>
-  <string name="menu_status">Status</string>
+  <string name="menu_status">Estado</string>
   <string name="menu_about">Sobre</string>
+  <string name="menu_shortcuts">Adicionar Atalhos</string>
   <string name="menu_clear">Limpar</string>
-  <string name="about_description">Rastreador GPS Real Time para dispositivos Android. Compatível com servidor Traccar e outros sistemas de rastreamento.</string>
+  <string name="about_description">Localizador GPS em tempo real para dispositivos Android. Compatível com servidor Traccar e outros sistemas de localização.</string>
   <string name="about_license">Esta aplicação é livre e de código aberto, o código fonte é licenciado sob a licença Apache Versão 2.0 e disponível no GitHub.</string>
-  <string name="about_web">Para mais informações visite\nwww.traccar.org/client</string>
+  <string name="about_web">Para mais informações visite \nwww.traccar.org/client</string>
   <string name="status_service_create">Serviço criado</string>
   <string name="status_service_destroy">Serviço destruído</string>
   <string name="status_send_fail">Falha no envio</string>
   <string name="status_location_update">Localização atualizada</string>
   <string name="status_connectivity_change">Mudança de conectividade</string>
+  <string name="hidden_app_name">Definições do Dispositivo</string>
+  <string name="hidden_alert">A aplicação foi ocultada com sucesso. Para abrir novamente, por favor contacte 8722227 (TRACCAR).</string>
 </resources>

app/src/main/res/values-ro/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Client Traccar</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Pornit</string>
+  <string name="shortcut_stop">Traccar - Oprit</string>
+  <string name="settings_id_title">Identificare dispozitiv</string>
+  <string name="settings_address_title">Adresă Server</string>
+  <string name="settings_address_summary">Nume domeniu sau adresă IP</string>
+  <string name="settings_port_title">Port Server</string>
+  <string name="settings_port_summary">Monitorizare port server TCP</string>
+  <string name="settings_interval_title">Frecvenţă</string>
+  <string name="settings_interval_summary">Interval mesaje în secunde</string>
+  <string name="settings_status_title">Status service</string>
+  <string name="settings_status_off">Pornit</string>
+  <string name="settings_status_on">Oprit</string>
+  <string name="settings_status_off_summary">Serviciu Oprit</string>
+  <string name="settings_status_on_summary">Serviciul rulează</string>
+  <string name="settings_secure_title">Criptare</string>
+  <string name="settings_secure_off">Activare</string>
+  <string name="settings_secure_on">Dezactivare</string>
+  <string name="settings_secure_off_summary">Criptare dezactivare</string>
+  <string name="settings_secure_on_summary">Criptare activă</string>
+  <string name="settings_provider_title">Furnizor locaţie</string>
+  <string name="settings_provider_summary">Sursă date localizare</string>
+  <string name="settings_provider_gps">Furnizor GPS</string>
+  <string name="settings_provider_network">Furnizor Reţea</string>
+  <string name="settings_provider_mixed">Furnizor Mixt</string>
+  <string name="settings_foreground_title">Serviciul prim-plan</string>
+  <string name="settings_foreground_summary">Creştere prioritate serviciu</string>
+  <string name="menu_status">Stare</string>
+  <string name="menu_about">Despre</string>
+  <string name="menu_shortcuts">Adăugare scurtătură</string>
+  <string name="menu_clear">Golire</string>
+  <string name="about_description">Localizare GPS în timp real pentru dispozitive Android. Compatibil cu Server Traccar si alte sisteme de localizare.</string>
+  <string name="about_license">Aplicaţia este gratuită şi open source, codul sursă este licenţiat sub Apache License Version 2.0 şi este disponibil pe GitHub.</string>
+  <string name="about_web">Pentru mai multe informaţii vizitaţi\nwww.traccar.org/client</string>
+  <string name="status_service_create">Serviciu creat</string>
+  <string name="status_service_destroy">Serviciu şters</string>
+  <string name="status_send_fail">Trimitere eşuată</string>
+  <string name="status_location_update">Actualizare locaţie</string>
+  <string name="status_connectivity_change">Schimbare conectivitate</string>
+  <string name="hidden_app_name">Setări Dispozitiv</string>
+  <string name="hidden_alert">Aplicaţia este ascunsă. Pentru deschidere vă rugam apelaţi numărul de telefon 8722227 (TRACCAR).</string>
+</resources>

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

@@ -2,6 +2,8 @@
 <resources>
   <string name="app_name">Traccar Клиент</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Старт</string>
+  <string name="shortcut_stop">Traccar - Стоп</string>
   <string name="settings_id_title">Идентификатор устройства</string>
   <string name="settings_address_title">Адрес сервера</string>
   <string name="settings_address_summary">Домен или IP адрес</string>
@@ -14,6 +16,11 @@
   <string name="settings_status_on">Стоп</string>
   <string name="settings_status_off_summary">Сервис остановлен</string>
   <string name="settings_status_on_summary">Сервис запущен</string>
+  <string name="settings_secure_title">Шифрование</string>
+  <string name="settings_secure_off">Доступный</string>
+  <string name="settings_secure_on">Недоступный</string>
+  <string name="settings_secure_off_summary">Шифрование недоступно</string>
+  <string name="settings_secure_on_summary">Шифрование включено</string>
   <string name="settings_provider_title">Провайдер местоположения</string>
   <string name="settings_provider_summary">Источник данных о местоположении</string>
   <string name="settings_provider_gps">GPS провайдер</string>
@@ -23,6 +30,7 @@
   <string name="settings_foreground_summary">Увеличить приоритет сервиса</string>
   <string name="menu_status">Состояние</string>
   <string name="menu_about">О программе</string>
+  <string name="menu_shortcuts">Добавить ярлыки</string>
   <string name="menu_clear">Очистить</string>
   <string name="about_description">Трекер для Android устройств. Совместим с Traccar сервером и другими мониторинговыми системами.</string>
   <string name="about_license">Это приложение распростаняется бесплатно, исходный код распростаняется по лицензии Apache License Version 2.0 и доступен на GitHub.</string>
@@ -32,4 +40,6 @@
   <string name="status_send_fail">Ошибка отправки</string>
   <string name="status_location_update">Обновление местоположения</string>
   <string name="status_connectivity_change">Изменение подключения</string>
+  <string name="hidden_app_name">Настройки устройтва</string>
+  <string name="hidden_alert">Приложение было спрятано. Чтобы открыть позвоните на номер 8722227 (TRACCAR).</string>
 </resources>

app/src/main/res/values-si/strings.xml

@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar Client</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - ආරම්භ කරන්න</string>
+  <string name="shortcut_stop">Traccar - නවතන්න</string>
+  <string name="settings_id_title">උපකරණ හඳුන්වනය</string>
+  <string name="settings_address_title">සර්වර් ලිපිනය</string>
+  <string name="settings_address_summary">ඩොමේන් නාමය හෝ අයි පී ලිපිනය</string>
+  <string name="settings_port_title">සර්වර් port</string>
+  <string name="settings_port_summary">Tracking server TCP port</string>
+  <string name="settings_interval_title">සංඛ්‍යාතය</string>
+  <string name="settings_interval_summary">Messages interval in seconds</string>
+  <string name="settings_status_title">සේවා තත්වය</string>
+  <string name="settings_status_off">ඇරැඹීම</string>
+  <string name="settings_status_on">නැවතීම</string>
+  <string name="settings_status_off_summary">සේවාව අක්‍රීයයි</string>
+  <string name="settings_status_on_summary">සේවාව ක්‍රියාත්මකයි</string>
+  <string name="settings_secure_title">Encryption</string>
+  <string name="settings_secure_off">ක්‍රියාත්මක කරන්න</string>
+  <string name="settings_secure_on">අක්‍රීය කරන්න</string>
+  <string name="settings_secure_off_summary">Encryption disabled</string>
+  <string name="settings_secure_on_summary">Encryption enabled</string>
+  <string name="settings_provider_title">Location provider</string>
+  <string name="settings_provider_summary">Source of location data</string>
+  <string name="settings_provider_gps">GPS provider</string>
+  <string name="settings_provider_network">Network provider</string>
+  <string name="settings_provider_mixed">Mixed provider</string>
+  <string name="settings_foreground_title">Foreground service</string>
+  <string name="settings_foreground_summary">Increase service priority</string>
+  <string name="menu_status">තත්වය</string>
+  <string name="menu_about">පිළිබඳ</string>
+  <string name="menu_shortcuts">කෙටි මං එකතු කරන්න</string>
+  <string name="menu_clear">හිස් කරන්න</string>
+  <string name="about_description">Real time GPS tracker for Android devices. Compatible with Traccar Server and other tracking systems.</string>
+  <string name="about_license">This application is free and open source, source code is licensed under Apache License Version 2.0 and available on GitHub.</string>
+  <string name="about_web">For more information visit\nwww.traccar.org/client</string>
+  <string name="status_service_create">සේවාව සකසන ලදි</string>
+  <string name="status_service_destroy">සේවාව නසන ලදි</string>
+  <string name="status_send_fail">යැවිය නොහැකිය</string>
+  <string name="status_location_update">Location update</string>
+  <string name="status_connectivity_change">Connectivity change</string>
+  <string name="hidden_app_name">උපකරණ සැකසුම්</string>
+</resources>

app/src/main/res/values-sk/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar Manager</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Štart</string>
+  <string name="shortcut_stop">Traccar - Stop</string>
+  <string name="settings_id_title">Identifikátor zariadenia</string>
+  <string name="settings_address_title">Adresa servera</string>
+  <string name="settings_address_summary">Názov domény alebo IP adresa</string>
+  <string name="settings_port_title">Port servera</string>
+  <string name="settings_port_summary">Sledovanie TCP portu servera</string>
+  <string name="settings_interval_title">Frekvencia</string>
+  <string name="settings_interval_summary">Interval správ v sekundách</string>
+  <string name="settings_status_title">Stav služby</string>
+  <string name="settings_status_off">Štart</string>
+  <string name="settings_status_on">Stop</string>
+  <string name="settings_status_off_summary">Služba sa zastavila</string>
+  <string name="settings_status_on_summary">Služba beží</string>
+  <string name="settings_secure_title">Šifrovanie</string>
+  <string name="settings_secure_off">Zapnúť</string>
+  <string name="settings_secure_on">Vypnúť</string>
+  <string name="settings_secure_off_summary">Šifrovanie vypnuté</string>
+  <string name="settings_secure_on_summary">Šifrovanie zapnuté</string>
+  <string name="settings_provider_title">Poskytovateľ polohy</string>
+  <string name="settings_provider_summary">Zdroj polohovacích údajov</string>
+  <string name="settings_provider_gps">Poskytovateľ GPS</string>
+  <string name="settings_provider_network">Poskytovateľ sieťových služieb</string>
+  <string name="settings_provider_mixed">Mix poskytovateľ </string>
+  <string name="settings_foreground_title">Služba v popredí</string>
+  <string name="settings_foreground_summary">Zvýšiť prioritu servis</string>
+  <string name="menu_status">Status</string>
+  <string name="menu_about">O</string>
+  <string name="menu_shortcuts">Pridanie skratiek</string>
+  <string name="menu_clear">Vyčistiť</string>
+  <string name="about_description">Real time GPS tracker pre Android zariadenia. Kompatibilný s Traccar Serverom a ďalšími sledovacími systémami.</string>
+  <string name="about_license">Táto aplikácia je zadarmo a open source, zdrojový kód pod licenciou Apache License verzie 2.0 a je k dispozícii na GitHub.</string>
+  <string name="about_web">Pre viac informácií navštívte visit\nwww.traccar.org/client</string>
+  <string name="status_service_create">Servis vytvoril</string>
+  <string name="status_service_destroy">Servis odstránený</string>
+  <string name="status_send_fail">Odoslanie zlyhalo</string>
+  <string name="status_location_update">Aktualizácia polohy</string>
+  <string name="status_connectivity_change">Zmena konektivity</string>
+  <string name="hidden_app_name">Nastavenie zariadenia</string>
+  <string name="hidden_alert">Aplikácia bola skrytá. Pre opätovné otvorenie znova vytočte 8722227 (TRACCAR).</string>
+</resources>

app/src/main/res/values-sl/strings.xml

@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar klient</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Zaženi</string>
+  <string name="shortcut_stop">Traccar - Ustavi</string>
+  <string name="settings_address_title">Naslov strežnika</string>
+  <string name="settings_status_off">Zaženi</string>
+  <string name="settings_status_on">Ustavi</string>
+  <string name="settings_status_off_summary">Servis ustavljen</string>
+  <string name="settings_status_on_summary">Servis teče</string>
+  <string name="settings_secure_title">Šifriranje</string>
+  <string name="settings_secure_off">Omogoči</string>
+  <string name="settings_secure_on">Onemogoči</string>
+  <string name="settings_secure_off_summary">Šifriranje onemogočeno</string>
+  <string name="settings_secure_on_summary">Šifriranje omogočeno</string>
+  <string name="menu_status">Stanje</string>
+  <string name="menu_clear">Počisti</string>
+  <string name="status_service_create">Servis ustvarjen</string>
+  <string name="status_service_destroy">Servis uničen</string>
+  <string name="status_send_fail">Pošiljanje spodletelo</string>
+  <string name="hidden_app_name">Nastavitve naprave</string>
+</resources>

app/src/main/res/values-sr/strings.xml

@@ -16,6 +16,11 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Servis zaustavljen</string>
   <string name="settings_status_on_summary">Servis pokrenut</string>
+  <string name="settings_secure_title">Šifrovanje</string>
+  <string name="settings_secure_off">Omogući</string>
+  <string name="settings_secure_on">Onemogući</string>
+  <string name="settings_secure_off_summary">Šifrovanje omogućeno</string>
+  <string name="settings_secure_on_summary">Šifrovanje onemogućeno</string>
   <string name="settings_provider_title">Provajder lokacije</string>
   <string name="settings_provider_summary">Izvor lokacijskih podataka</string>
   <string name="settings_provider_gps">GPS provajder</string>

app/src/main/res/values-ta/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">ட்ரக்கர் பணி செயலி</string>
+  <string name="app_logo">ட்ரக்கர் </string>
+  <string name="shortcut_start">ட்ரக்கர் - தொடங்கு</string>
+  <string name="shortcut_stop">ட்ரக்கர் - நிறுத்து</string>
+  <string name="settings_id_title">அடையாளங்காட்டி</string>
+  <string name="settings_address_title">சர்வர் முகவரி</string>
+  <string name="settings_address_summary">துறை பெயர் / இணைய நெறிமுறை முகவரி</string>
+  <string name="settings_port_title">சர்வர் முகப்பு</string>
+  <string name="settings_port_summary">கண்காணிப்பு சர்வர் TCP முகப்பு</string>
+  <string name="settings_interval_title">அதிர்வெண்</string>
+  <string name="settings_interval_summary">நொடிகளில் செய்திகள் இடைவெளி</string>
+  <string name="settings_status_title">சேவை நிலை</string>
+  <string name="settings_status_off">துவக்கு</string>
+  <string name="settings_status_on">நிறுத்து</string>
+  <string name="settings_status_off_summary">சேவை நிறுத்தப்பட்டது</string>
+  <string name="settings_status_on_summary">சேவை இயங்குகிறது</string>
+  <string name="settings_secure_title">குறியாக்கு</string>
+  <string name="settings_secure_off">செயல்படுத்து</string>
+  <string name="settings_secure_on">முடக்கு</string>
+  <string name="settings_secure_off_summary">குறியாக்கம் முடக்கப்பட்டுள்ளது</string>
+  <string name="settings_secure_on_summary">குறியாக்கம் செயல்படுத்தப்பட்டுள்ளது</string>
+  <string name="settings_provider_title">இடம் வழங்குநர்</string>
+  <string name="settings_provider_summary">மூல இடத்தரவு</string>
+  <string name="settings_provider_gps">நேரடி பூகோள இடம்காடி வழங்குநர்</string>
+  <string name="settings_provider_network">பிணையம் வழங்குநர்</string>
+  <string name="settings_provider_mixed">கலப்பு வழங்குநர்</string>
+  <string name="settings_foreground_title">பின்னணி சேவை</string>
+  <string name="settings_foreground_summary">சேவை முன்னுரிமை அதிகரிக்க</string>
+  <string name="menu_status">நிலை</string>
+  <string name="menu_about">பற்றி</string>
+  <string name="menu_shortcuts">குறுக்குவழி சேர்க்க</string>
+  <string name="menu_clear">அழிக்கவும்</string>
+  <string name="about_description">இது ஒரு ட்ரக்கர் சர்வர் சார்ந்த ஆன்டிராயிடு நேரடி பூகோள இடம்காடி மற்றும் கண்காணிப்பு செயலி</string>
+  <string name="about_license">இந்த செயலி பயன்பாட்டை இலவசமாக மற்றும் திறந்த செயலி அபாச்சி பதிப்பு 2.0 முறை மூலம்  வழங்கப்படுகிறது, மேலும் செயலி மூல குறியீடு தரவிறக்கம் கிட்குப்பில் உள்ளது</string>
+  <string name="about_web">மேலும் தகவல்களுக்கு அணுகவும் www.traccar.org/client</string>
+  <string name="status_service_create">சேவை உருவாகப்பட்டது</string>
+  <string name="status_service_destroy">சேவை அழிக்கப்பட்டது</string>
+  <string name="status_send_fail">தகவல் அனுப்புதல் தோல்வியுற்றது</string>
+  <string name="status_location_update">இடம் மேம்படுத்தல்</string>
+  <string name="status_connectivity_change">இணைப்பு மாற்றம்</string>
+  <string name="hidden_app_name">சாதன அமைப்புகள்</string>
+  <string name="hidden_alert">செயலி மறைக்கப்பட்டுள்ளது. அதை காண பின்வரும் எண்ணை அழைக்கவும் 8722227 ( ட்ரக்கர் )</string>
+</resources>

app/src/main/res/values-th/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar Client</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">เริ่ม Traccar</string>
+  <string name="shortcut_stop">หยุด Traccar</string>
+  <string name="settings_id_title">หมายเลขอุปกรณ์</string>
+  <string name="settings_address_title">ที่อยู่เซิร์ฟเวอร์</string>
+  <string name="settings_address_summary">ชื่อโดเมน หรือ ที่อยู่ไอพี</string>
+  <string name="settings_port_title">เซิร์ฟเวอร์พอร์ต</string>
+  <string name="settings_port_summary">พอร์ต TCP เซิร์ฟเวอร์ติดตาม</string>
+  <string name="settings_interval_title">ช่วงเวลาส่งข้อมูล</string>
+  <string name="settings_interval_summary">ช่วงเวลาส่งข้อมูลทุกกี่วินาที</string>
+  <string name="settings_status_title">สถานะเซิร์ฟเวอร์</string>
+  <string name="settings_status_off">เริ่มต้น</string>
+  <string name="settings_status_on">สิ้นสุด</string>
+  <string name="settings_status_off_summary">เริ่มทำงาน</string>
+  <string name="settings_status_on_summary">หยุดทำงาน</string>
+  <string name="settings_secure_title">เข้ารหัส</string>
+  <string name="settings_secure_off">เลือก</string>
+  <string name="settings_secure_on">ไม่เลือก</string>
+  <string name="settings_secure_off_summary">ไม่เข้ารหัสข้อมูล</string>
+  <string name="settings_secure_on_summary">เข้ารหัสข้อมูล</string>
+  <string name="settings_provider_title">ตัวบอกตำแหน่ง</string>
+  <string name="settings_provider_summary">แหล่งของข้อมูลบอกตำแหน่ง</string>
+  <string name="settings_provider_gps">ใช้จาก GPS</string>
+  <string name="settings_provider_network">ใช้จากข้อมูลเครือข่าย</string>
+  <string name="settings_provider_mixed">ใช้ร่วมกันทั้งสองแบบ</string>
+  <string name="settings_foreground_title">ทำงานเบื้องหน้า</string>
+  <string name="settings_foreground_summary">เพิ่มความลำดับสำคัญการทำงาน</string>
+  <string name="menu_status">สถานะ</string>
+  <string name="menu_about">เกี่ยวกับ</string>
+  <string name="menu_shortcuts">เพิ่มชอร์ตคัท</string>
+  <string name="menu_clear">ล้างข้อมูล</string>
+  <string name="about_description">Real time GPS tracker for Android devices. Compatible with Traccar Server and other tracking systems.</string>
+  <string name="about_license">This application is free and open source, source code is licensed under Apache License Version 2.0 and available on GitHub.</string>
+  <string name="about_web">For more information visit\nwww.traccar.org/client</string>
+  <string name="status_service_create">เริ่มทำงาน</string>
+  <string name="status_service_destroy">เลิกการทำงาน</string>
+  <string name="status_send_fail">ส่งข้อมูลล้มเหลว</string>
+  <string name="status_location_update">ปรับปรุงตำแหน่ง</string>
+  <string name="status_connectivity_change">เปลี่ยนแปลงการเชื่อมต่อ</string>
+  <string name="hidden_app_name">ตั้งค่าอุปกรณ์</string>
+  <string name="hidden_alert">The app has been hidden. To open it again please dial 8722227 (TRACCAR).</string>
+</resources>

app/src/main/res/values-tr/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar Yönetim</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Başlat</string>
+  <string name="shortcut_stop">Traccar - Durdur</string>
+  <string name="settings_id_title">Cihaz Kimliği</string>
+  <string name="settings_address_title">Sunucu Adresi</string>
+  <string name="settings_address_summary">Alanadı veya IP adresi</string>
+  <string name="settings_port_title">Sunucu Portu</string>
+  <string name="settings_port_summary">İzleme Sunucusu TCP portu</string>
+  <string name="settings_interval_title">Sıklık</string>
+  <string name="settings_interval_summary">Mesaj aralığı Sn.</string>
+  <string name="settings_status_title">Servis Durumu</string>
+  <string name="settings_status_off">Başlat</string>
+  <string name="settings_status_on">Durdur</string>
+  <string name="settings_status_off_summary">Servis Durdu</string>
+  <string name="settings_status_on_summary">Servis Çalışıyor</string>
+  <string name="settings_secure_title">Şifreleme</string>
+  <string name="settings_secure_off">Etkinleştir</string>
+  <string name="settings_secure_on">Engelle</string>
+  <string name="settings_secure_off_summary">Şifreleme Yok</string>
+  <string name="settings_secure_on_summary">Şifreleme</string>
+  <string name="settings_provider_title">Yer sağlayıcı</string>
+  <string name="settings_provider_summary">Yer bilgisi kaynağı</string>
+  <string name="settings_provider_gps">GPS sağlayıcı</string>
+  <string name="settings_provider_network">Network sağlayıcı</string>
+  <string name="settings_provider_mixed">Karışık sağlayıcı</string>
+  <string name="settings_foreground_title">Önplan servisi</string>
+  <string name="settings_foreground_summary">Servis önceliği arttır</string>
+  <string name="menu_status">Durum</string>
+  <string name="menu_about">Hakkında</string>
+  <string name="menu_shortcuts">Kısayol ekle</string>
+  <string name="menu_clear">Temizle</string>
+  <string name="about_description">Android cihazlar için gerçek zamanlı takip uygulaması. Traccar sunucuları ve diğer takip sistemleriyle uyumlu.</string>
+  <string name="about_license">Bu uygulama ücretsiz ve acık kaynaklıdır , kaynak kodu lisansı Apache License Version 2.0 altında lisanslı ve GitHub üzerinden ulaşılabilir.</string>
+  <string name="about_web">Daha fazla bilgi için http:\\www.traccar.org/client adresini ziyaret edin.</string>
+  <string name="status_service_create">Servis oluşturuldu</string>
+  <string name="status_service_destroy">Servis kaldırıldı.</string>
+  <string name="status_send_fail">Gönderme başarısız</string>
+  <string name="status_location_update">Yer güncellendi</string>
+  <string name="status_connectivity_change">Bağlantı değişimi</string>
+  <string name="hidden_app_name">Cihaz Ayarları</string>
+  <string name="hidden_alert">Bu uygulama arkaplanda gizli olarak çalışmaktadır. Tekrar görmek için lütfen 8722227 tuşlayın. Arayın. (TRACCAR)</string>
+</resources>

app/src/main/res/values-uk/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar Клієнт</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Старт</string>
+  <string name="shortcut_stop">Traccar - Стоп</string>
+  <string name="settings_id_title">Ідентифікатор пристрою</string>
+  <string name="settings_address_title">Адреса сервера</string>
+  <string name="settings_address_summary">Домен або ІР адреса</string>
+  <string name="settings_port_title">Порт сервера</string>
+  <string name="settings_port_summary">TCP порт сервера</string>
+  <string name="settings_interval_title">Частота</string>
+  <string name="settings_interval_summary">Інтервал повідомлень в секундах</string>
+  <string name="settings_status_title">Стан сервісу</string>
+  <string name="settings_status_off">Старт</string>
+  <string name="settings_status_on">Стоп</string>
+  <string name="settings_status_off_summary">Сервіс зупинений</string>
+  <string name="settings_status_on_summary">Сервіс працює</string>
+  <string name="settings_secure_title">Кодування</string>
+  <string name="settings_secure_off">Увімкнути</string>
+  <string name="settings_secure_on">Вимкнути</string>
+  <string name="settings_secure_off_summary">Кодування вимкнене</string>
+  <string name="settings_secure_on_summary">Кодування увімкнене</string>
+  <string name="settings_provider_title">Місцезнаходження провайдера</string>
+  <string name="settings_provider_summary">Джерело місцезнаходження</string>
+  <string name="settings_provider_gps">Дані GPS</string>
+  <string name="settings_provider_network">Дані мережі провайдера</string>
+  <string name="settings_provider_mixed">Змішані дані</string>
+  <string name="settings_foreground_title">Служба переднього плану</string>
+  <string name="settings_foreground_summary">Збільшення пріоритету обслуговування</string>
+  <string name="menu_status">Статус</string>
+  <string name="menu_about">Про</string>
+  <string name="menu_shortcuts">Додати ярлики</string>
+  <string name="menu_clear">Очистити</string>
+  <string name="about_description">GPS трекер реального часу для Android пристроїв. Сумісність з Traccar сервером і іншими системами стеження.</string>
+  <string name="about_license">Цей додаток є безкоштовним з відкритим кодом, код розміщений під ліцензією Apache License версії 2.0 і доступний на GitHub.</string>
+  <string name="about_web">Більше інформації на сайті \nwww.traccar.org/client</string>
+  <string name="status_service_create">Сервіс створений</string>
+  <string name="status_service_destroy">Сервіс знищено</string>
+  <string name="status_send_fail">Відправлення  невдале</string>
+  <string name="status_location_update">Оновлення розташування</string>
+  <string name="status_connectivity_change">Зміна підключення</string>
+  <string name="hidden_app_name">Налаштування пристрою</string>
+  <string name="hidden_alert">Додаток було приховано. Щоб відкрити його знову наберіть 8722227 (TRACCAR).</string>
+</resources>

app/src/main/res/values-vi/strings.xml

@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Máy khách Traccar</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Bắt đầu</string>
+  <string name="shortcut_stop">Traccar - Kết thúc</string>
+  <string name="settings_id_title">Định danh thiết bị</string>
+  <string name="settings_address_title">Địa chỉ máy chủ</string>
+  <string name="settings_address_summary">Tên miền hoặc địa chỉ IP</string>
+  <string name="settings_port_title">Cổng máy chủ</string>
+  <string name="settings_port_summary">Cổng TCP theo dõi máy chủ</string>
+  <string name="settings_interval_title">Tần suất</string>
+  <string name="settings_interval_summary">Chu kỳ tin nhắn theo đơn vị giây</string>
+  <string name="settings_status_title">Trạng thái dịch vụ</string>
+  <string name="settings_status_off">Bắt đầu</string>
+  <string name="settings_status_on">Kết thúc</string>
+  <string name="settings_status_off_summary">Dịch vụ kết thúc</string>
+  <string name="settings_status_on_summary">Dịch vụ đang hoạt động</string>
+  <string name="settings_secure_title">Mã hóa</string>
+  <string name="settings_secure_off">Kích hoạt</string>
+  <string name="settings_secure_on">Ngừng kích hoạt</string>
+  <string name="settings_secure_off_summary">Không mã hóa</string>
+  <string name="settings_secure_on_summary">Kích hoạt mã hóa</string>
+  <string name="settings_provider_title">Định vị</string>
+  <string name="settings_provider_summary">Nguồn dữ liệu vị trí</string>
+  <string name="settings_provider_gps">Thiết bị GPS</string>
+  <string name="settings_provider_network">Nhà cung cấp mạng</string>
+  <string name="settings_provider_mixed">Nhà cung cấp tổng hợp</string>
+  <string name="settings_foreground_title">Dịch vụ chạy nổi</string>
+  <string name="settings_foreground_summary">Tăng thứ tự ưu tiên dịch vụ</string>
+  <string name="menu_status">Trạng thái</string>
+  <string name="menu_about">About</string>
+  <string name="menu_shortcuts">Thêm phím tắt</string>
+  <string name="menu_clear">Xóa</string>
+  <string name="about_description">Định vị GPS thời gian thực cho thiết bị Android. Tương thích với máy chủ Traccar và các hệ thống theo dõi khác.</string>
+  <string name="about_license">Ứng dụng miễn phí và mã nguồn mở, mã nguồn được phát hành theo giấy phép Apache License phiên bản 2.0 trên GitHub.</string>
+  <string name="about_web">Thông tin chi tiết\nwww.traccar.org/client</string>
+  <string name="status_service_create">Dịch vụ đã được khởi tạo</string>
+  <string name="status_service_destroy">Dịch vụ đã được hủy</string>
+  <string name="status_send_fail">Gửi lỗi</string>
+  <string name="status_location_update">Vị trí đã được cập nhật</string>
+  <string name="status_connectivity_change">Kết nối thay đổi</string>
+  <string name="hidden_app_name">Cài đặt thiết bị</string>
+  <string name="hidden_alert">Ứng dụng đã được ẩn. Để mở lại xin vui lòng gọi 8722227 (TRACCAR).</string>
+</resources>

app/src/main/res/values/strings.xml

@@ -4,6 +4,7 @@
   <string name="app_logo">Traccar</string>
   <string name="shortcut_start">Traccar - Start</string>
   <string name="shortcut_stop">Traccar - Stop</string>
+  <string name="shortcut_sos">Traccar - SOS</string>
   <string name="settings_id_title">Device identifier</string>
   <string name="settings_address_title">Server address</string>
   <string name="settings_address_summary">Domain name or IP address</string>
@@ -16,6 +17,11 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Service stopped</string>
   <string name="settings_status_on_summary">Service running</string>
+  <string name="settings_secure_title">Encryption</string>
+  <string name="settings_secure_off">Enable</string>
+  <string name="settings_secure_on">Disable</string>
+  <string name="settings_secure_off_summary">Encryption disabled</string>
+  <string name="settings_secure_on_summary">Encryption enabled</string>
   <string name="settings_provider_title">Location provider</string>
   <string name="settings_provider_summary">Source of location data</string>
   <string name="settings_provider_gps">GPS provider</string>
@@ -32,6 +38,7 @@
   <string name="about_web">For more information visit\nwww.traccar.org/client</string>
   <string name="status_service_create">Service created</string>
   <string name="status_service_destroy">Service destroyed</string>
+  <string name="status_send_success">Send successfully</string>
   <string name="status_send_fail">Send failed</string>
   <string name="status_location_update">Location update</string>
   <string name="status_connectivity_change">Connectivity change</string>

app/src/main/res/xml-v14/preferences.xml

@@ -27,6 +27,15 @@
         android:summary="@string/settings_port_summary"
         android:title="@string/settings_port_title" />
 
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="secure"
+        android:summaryOff="@string/settings_secure_off_summary"
+        android:summaryOn="@string/settings_secure_on_summary"
+        android:switchTextOff="@string/settings_secure_off"
+        android:switchTextOn="@string/settings_secure_on"
+        android:title="@string/settings_secure_title" />
+
     <EditTextPreference
         android:defaultValue="300"
         android:key="interval"
@@ -42,4 +51,4 @@
         android:summary="@string/settings_provider_summary"
         android:title="@string/settings_provider_title" />
 
-</PreferenceScreen>
+</PreferenceScreen>

app/src/main/res/xml/preferences.xml

@@ -25,6 +25,13 @@
         android:summary="@string/settings_port_summary"
         android:title="@string/settings_port_title" />
 
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="secure"
+        android:summaryOff="@string/settings_secure_off_summary"
+        android:summaryOn="@string/settings_secure_on_summary"
+        android:title="@string/settings_secure_title" />
+
     <EditTextPreference
         android:defaultValue="300"
         android:key="interval"

app/src/test/java/org/traccar/client/ProtocolFormatterTest.java

@@ -22,7 +22,7 @@ public class ProtocolFormatterTest {
         Position position = new Position("123456789012345", new Location("gps"), 0);
         position.setTime(new Date(0));
 
-        String url = ProtocolFormatter.formatRequest("localhost", 5055, position);
+        String url = ProtocolFormatter.formatRequest("localhost", 5055, false, position);
 
         assertEquals("http://localhost:5055?id=123456789012345&timestamp=0&lat=0.0&lon=0.0&speed=0.0&bearing=0.0&altitude=0.0&batt=0.0", url);
 

build.gradle

@@ -2,15 +2,15 @@
 
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 
 allprojects {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega