Update project and tests

app/build.gradle

@@ -4,25 +4,27 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        applicationId "org.traccar.client"
+        applicationId 'org.traccar.client'
-        buildConfigField "boolean", "HIDDEN_APP", "false"
+        buildConfigField 'boolean', 'HIDDEN_APP', 'false'
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 60
+        versionCode 64
-        versionName '5.23'
+        versionName '6.3'
     }
 
     lintOptions {
         checkReleaseBuilds false
     }
 
-    flavorDimensions "default"
+    flavorDimensions 'default'
     productFlavors {
-        regular
+        regular {
+            isDefault.set(true)
+        }
         google
         hidden {
-            applicationId "org.traccar.client.hidden"
+            applicationId 'org.traccar.client.hidden'
-            buildConfigField "boolean", "HIDDEN_APP", "true"
+            buildConfigField 'boolean', 'HIDDEN_APP', 'true'
         }
     }
 
@@ -34,18 +36,19 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.android.material:material:1.1.0-alpha10'
+    implementation 'com.google.android.material:material:1.3.0-alpha01'
-    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.preference:preference:1.1.1'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     testImplementation 'org.robolectric:robolectric:4.1'
-    googleImplementation 'com.google.firebase:firebase-core:17.2.0'
+    googleImplementation 'com.google.firebase:firebase-core:17.4.3'
     googleImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
-    googleImplementation "com.google.android.gms:play-services-location:17.0.0"
+    googleImplementation 'com.google.firebase:firebase-analytics:17.4.3'
+    googleImplementation 'com.google.android.gms:play-services-location:17.0.0'
 }
 
-if (getGradle().getStartParameter().getTaskRequests().toString().contains("Google")) {
+if (getGradle().getStartParameter().getTaskRequests().toString().contains('Google')) {
     apply plugin: 'com.google.gms.google-services'
-    apply plugin: 'io.fabric'
+    apply plugin: 'com.google.firebase.crashlytics'
 
     task copyJson(type: Copy) {
         from '../../traccar-shared/google-services'

app/src/hidden/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
+    <background android:drawable="@color/light"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/hidden/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
+    <background android:drawable="@color/light"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2012 - 2020 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,22 +27,27 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.InputType;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.webkit.URLUtil;
+import android.widget.EditText;
+import android.widget.Toast;
+
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
 import androidx.preference.EditTextPreference;
+import androidx.preference.EditTextPreferenceDialogFragmentCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 import androidx.preference.TwoStatePreference;
 
-import android.util.Log;
+import java.util.Arrays;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.webkit.URLUtil;
-import android.widget.Toast;
-
 import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
@@ -60,6 +65,7 @@ public class MainFragment extends PreferenceFragmentCompat implements OnSharedPr
     public static final String KEY_ANGLE = "angle";
     public static final String KEY_ACCURACY = "accuracy";
     public static final String KEY_STATUS = "status";
+    public static final String KEY_BUFFER = "buffer";
 
     private static final int PERMISSIONS_REQUEST_LOCATION = 2;
 
@@ -134,6 +140,36 @@ public class MainFragment extends PreferenceFragmentCompat implements OnSharedPr
 
     }
 
+    public static class NumericEditTextPreferenceDialogFragment extends EditTextPreferenceDialogFragmentCompat {
+
+        public static NumericEditTextPreferenceDialogFragment newInstance(String key) {
+            final NumericEditTextPreferenceDialogFragment fragment = new NumericEditTextPreferenceDialogFragment();
+            final Bundle bundle = new Bundle();
+            bundle.putString(ARG_KEY, key);
+            fragment.setArguments(bundle);
+            return fragment;
+        }
+
+        @Override
+        protected void onBindDialogView(View view) {
+            EditText editText = view.findViewById(android.R.id.edit);
+            editText.setInputType(InputType.TYPE_CLASS_NUMBER);
+            super.onBindDialogView(view);
+        }
+
+    }
+
+    @Override
+    public void onDisplayPreferenceDialog(Preference preference) {
+        if (Arrays.asList(KEY_INTERVAL, KEY_DISTANCE, KEY_ANGLE).contains(preference.getKey())) {
+            final EditTextPreferenceDialogFragmentCompat f = NumericEditTextPreferenceDialogFragment.newInstance(preference.getKey());
+            f.setTargetFragment(this, 0);
+            f.show(getFragmentManager(), "androidx.preference.PreferenceFragment.DIALOG");
+        } else {
+            super.onDisplayPreferenceDialog(preference);
+        }
+    }
+
     private void removeLauncherIcon() {
         String className = MainActivity.class.getCanonicalName().replace(".MainActivity", ".Launcher");
         ComponentName componentName = new ComponentName(getActivity().getPackageName(), className);
@@ -169,6 +205,7 @@ public class MainFragment extends PreferenceFragmentCompat implements OnSharedPr
         findPreference(KEY_DISTANCE).setEnabled(enabled);
         findPreference(KEY_ANGLE).setEnabled(enabled);
         findPreference(KEY_ACCURACY).setEnabled(enabled);
+        findPreference(KEY_BUFFER).setEnabled(enabled);
     }
 
     @Override

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

@@ -35,6 +35,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
     private SharedPreferences preferences;
 
     private String url;
+    private boolean buffer;
 
     private PositionProvider positionProvider;
     private DatabaseHelper databaseHelper;
@@ -50,6 +51,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
         isOnline = networkManager.isOnline();
 
         url = preferences.getString(MainFragment.KEY_URL, context.getString(R.string.settings_url_default_value));
+        buffer = preferences.getBoolean(MainFragment.KEY_BUFFER, true);
     }
 
     public void start() {
@@ -78,7 +80,11 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
     public void onPositionUpdate(Position position) {
         StatusActivity.addMessage(context.getString(R.string.status_location_update));
         if (position != null) {
-            write(position);
+            if (buffer) {
+                write(position);
+            } else {
+                send(position);
+            }
         }
     }
 
@@ -173,10 +179,14 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
             @Override
             public void onComplete(boolean success) {
                 if (success) {
-                    delete(position);
+                    if (buffer) {
+                        delete(position);
+                    }
                 } else {
                     StatusActivity.addMessage(context.getString(R.string.status_send_fail));
-                    retry();
+                    if (buffer) {
+                        retry();
+                    }
                 }
             }
         });

app/src/main/res/mipmap-anydpi-v26/ic_sos.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
+    <background android:drawable="@color/light"/>
     <foreground android:drawable="@mipmap/ic_sos_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_sos_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
+    <background android:drawable="@color/light"/>
     <foreground android:drawable="@mipmap/ic_sos_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_start.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
+    <background android:drawable="@color/light"/>
     <foreground android:drawable="@mipmap/ic_start_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_start_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
+    <background android:drawable="@color/light"/>
     <foreground android:drawable="@mipmap/ic_start_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_stop.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
+    <background android:drawable="@color/light"/>
     <foreground android:drawable="@mipmap/ic_stop_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_stop_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
+    <background android:drawable="@color/light"/>
     <foreground android:drawable="@mipmap/ic_stop_foreground"/>
 </adaptive-icon>

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

@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar-kliënt</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Begin diens</string>
+  <string name="shortcut_stop">Stop diens</string>
+  <string name="shortcut_sos">Stuur SOS</string>
+  <string name="channel_default">Primêre Kanaal</string>
+  <string name="settings_id_title">Toestel-identifiseerder</string>
+  <string name="settings_url_title">Bediener-URL</string>
+  <string name="settings_url_summary">Volg bediener-URL</string>
+  <string name="settings_interval_title">Frekwensie</string>
+  <string name="settings_interval_summary">Rapporteer interval in sekondes</string>
+  <string name="settings_distance_title">Afstand</string>
+  <string name="settings_distance_summary">Rapporteer afstand in meter</string>
+  <string name="settings_angle_title">Hoek</string>
+  <string name="settings_angle_summary">Rapporteringshoek in grade</string>
+  <string name="settings_status_title">Diensstatus</string>
+  <string name="settings_status_off">Begin</string>
+  <string name="settings_status_on">Stop</string>
+  <string name="settings_status_off_summary">Diens gestop</string>
+  <string name="settings_status_on_summary">Diens loop</string>
+  <string name="settings_buffer">Vanlyn buffer</string>
+  <string name="settings_buffer_off_summary">Buffer af</string>
+  <string name="settings_buffer_on_summary">Buffer aan</string>
+  <string name="settings_accuracy_title">Ligging akkuraatheid</string>
+  <string name="settings_accuracy_summary">Verlangde ligging akkuraatheid</string>
+  <string name="settings_accuracy_high">Hoog</string>
+  <string name="settings_accuracy_medium">Medium</string>
+  <string name="settings_accuracy_low">Laag</string>
+  <string name="settings_foreground_title">Voorgrond diens</string>
+  <string name="settings_foreground_summary">Verhoog diensprioriteit</string>
+  <string name="menu_status">Status</string>
+  <string name="menu_shortcuts">Voeg kortpaaie by</string>
+  <string name="menu_clear">Skoonmaak</string>
+  <string name="status_service_create">Diens het begin</string>
+  <string name="status_service_destroy">Diens het gestop</string>
+  <string name="status_send_success">Stuur suksesvol</string>
+  <string name="status_send_fail">Stuur misluk</string>
+  <string name="status_location_update">Ligging opdateer</string>
+  <string name="status_network_online">Netwerk aanlyn</string>
+  <string name="status_network_offline">Netwerk vanlyn</string>
+  <string name="hidden_app_name">Toestelinstellings</string>
+  <string name="hidden_alert">Die toep is versteek. Skakel 8722227 (TRACCAR) om dit weer oop te maak.</string>
+  <string name="error_msg_invalid_url">Voer \'n geldige http: // of https: // URL in</string>
+</resources>

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

@@ -28,12 +28,8 @@
   <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_success">تم الإرسال بنجاح</string>

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

@@ -28,12 +28,8 @@
   <string name="settings_foreground_title">Ön xidməti</string>
   <string name="settings_foreground_summary">Xidmət prioritetini artırın</string>
   <string name="menu_status">vəziyyət</string>
-  <string name="menu_about">Haqqında</string>
   <string name="menu_shortcuts">Qısa yollar əlavə edin</string>
   <string name="menu_clear">Aydındır</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">Xidmət başladı</string>
   <string name="status_service_destroy">Xidmət dayandı</string>
   <string name="status_send_success">Uğurla göndərin</string>

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

@@ -28,12 +28,8 @@
   <string name="settings_foreground_title">Foreground service</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_success">Успешно изпращане</string>

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

@@ -19,12 +19,8 @@
   <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 ট্র্যাকার। Traccar সার্ভার এবং অন্যান্য ট্র্যাকিং সিস্টেমগুলির সাথে সামঞ্জস্যপূর্ণ।</string>
-  <string name="about_license">এই অ্যাপ্লিকেশনটি বিনামূল্যে প্রদানকৃত এবং ওপেন সোর্স, সোর্স কোডটি Apache License Version 2.0 এর অধীনে লাইসেন্স করা এবং GitHub এ রক্ষিত।</string>
-  <string name="about_web">আরও তথ্যের জন্য www.traccar.org/client দেখুন</string>
   <string name="status_send_success">সফলভাবে পাঠান হয়েছে</string>
   <string name="status_send_fail">পাঠান ব্যর্থ হয়েছে</string>
   <string name="status_location_update">অবস্থান আপডেট</string>

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

@@ -28,12 +28,8 @@
   <string name="settings_foreground_title">Popředí služba</string>
   <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>
-  <string name="about_web">Pro více informací navštivte\nwww.traccar.org/client</string>
   <string name="status_service_create">Služba spuštěna</string>
   <string name="status_service_destroy">Služba zastavena</string>
   <string name="status_send_success">Úspěšně odesláno</string>

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

@@ -23,12 +23,8 @@
   <string name="settings_foreground_title">Forgrunds tjeneste</string>
   <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">Slet</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 gratis og open source. Kildekoden er licenseret under Apache License Version 2.0 og tilgængelig på GitHub.</string>
-  <string name="about_web">For mere information besøg\nwww.traccar.org/client</string>
   <string name="status_service_create">Tjenesten kører</string>
   <string name="status_service_destroy">Tjenesten er stoppet</string>
   <string name="status_send_success">Send succesfuld</string>

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

@@ -28,12 +28,8 @@
   <string name="settings_foreground_title">Vordergrund Service</string>
   <string name="settings_foreground_summary">Servicepriorität erhöhen</string>
   <string name="menu_status">Status</string>
-  <string name="menu_about">Über</string>
   <string name="menu_shortcuts">Verknüpfung hinzufügen</string>
   <string name="menu_clear">Leeren</string>
-  <string name="about_description">Echtzeit GPS Ortung für Android Geräte. Kompatibel mit Traccar Server und anderen Ortungsservern.</string>
-  <string name="about_license">Dieses Programm ist frei und Open Source. Es ist unter Apache Lizenz Version 2.0 lizenziert und ist auf GitHub verfügbar.</string>
-  <string name="about_web">Für weitere Informationen besuchen Sie www.traccar.org/client</string>
   <string name="status_service_create">Dienst gestartet</string>
   <string name="status_service_destroy">Dienst gestoppt</string>
   <string name="status_send_success">Erfolgreich gesendet</string>

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

@@ -28,12 +28,8 @@
   <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_success">Απεστάλη επιτυχώς</string>

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

@@ -28,13 +28,8 @@
   <string name="settings_foreground_title">Servicio en primer plano</string>
   <string name="settings_foreground_summary">Aumentar prioridad del 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 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 iniciado</string>
   <string name="status_service_destroy">Servicio detenido</string>
   <string name="status_send_success">Enviado correctamente</string>

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

@@ -28,13 +28,8 @@
   <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 برای اندروید . سازگار با سرورهای Traccar و سایر سرورهای ردیاب</string>
-  <string name="about_license">این نرم افزار مجانی و سورس باز تحت لیسانس Apache  نگارش 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_success">ارسال موفق</string>

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

@@ -20,6 +20,9 @@
   <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_buffer">Offline-puskurointi</string>
+  <string name="settings_buffer_off_summary">Puskurointi pois päältä</string>
+  <string name="settings_buffer_on_summary">Puskurointi päälle</string>
   <string name="settings_accuracy_title">Sijainnin tarkkuus</string>
   <string name="settings_accuracy_summary">Haluttu sijainnin tarkkuus</string>
   <string name="settings_accuracy_high">Korkea</string>
@@ -28,12 +31,8 @@
   <string name="settings_foreground_title">Edustapalvelu</string>
   <string name="settings_foreground_summary">Lisää palvelun prioriteettia</string>
   <string name="menu_status">Tila</string>
-  <string name="menu_about">Tietoja</string>
   <string name="menu_shortcuts">Lisää pikakuvakkeet</string>
   <string name="menu_clear">Tyhjennä</string>
-  <string name="about_description">Reaaliaikainen GPS-paikannin Android-laitteille. Yhteensopiva Traccar-palvelimen ja muiden paikannusjärjestelmien kanssa.</string>
-  <string name="about_license">Tämä sovellus on vapaata ja avointa lähdekoodia. Lähdekoodi on lisensoitu Apache License Version 2.0 -lisenssillä ja on saatavilla GitHubissa.</string>
-  <string name="about_web">Lisätietoa saat osoitteessa: \nwww.traccar.org/client</string>
   <string name="status_service_create">Palvelu käynnistynyt</string>
   <string name="status_service_destroy">Palvelu pysähtyi</string>
   <string name="status_send_success">Lähetys onnistui</string>

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

@@ -28,12 +28,8 @@
   <string name="settings_foreground_title">Un service de premier plan</string>
   <string name="settings_foreground_summary">Augmenter la priorité de service</string>
   <string name="menu_status">Etat</string>
-  <string name="menu_about">A propos</string>
   <string name="menu_shortcuts">Ajouter des raccourcis</string>
   <string name="menu_clear">Effacer</string>
-  <string name="about_description">Suivi GPS en temps réels pour appareils Android. Compatible avec le serveur Traccar ainsi que d\'autres plateformes de suivi.</string>
-  <string name="about_license">Cette application open source est gratuite. Le code source est disponible sur GitHub est sous licence Apache Version 2.0.</string>
-  <string name="about_web">Pour plus d’information, visitez le site: \nwww.traccar.org/client</string>
   <string name="status_service_create">Service démarré</string>
   <string name="status_service_destroy">Service arrêté</string>
   <string name="status_send_success">Envoyé avec succès</string>

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

@@ -28,12 +28,8 @@
   <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">יישום זה הוא קוד פתוח, קוד המקור מורשה תחת רישיון Apache גירסה 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_success">נשלח בהצלחה</string>

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

@@ -28,12 +28,8 @@
   <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_success">सफलता भेजें</string>

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

@@ -25,12 +25,8 @@
   <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">Servis pokrenut</string>
   <string name="status_service_destroy">Servis zaustavljen</string>
   <string name="status_send_success">Slanje uspješno</string>

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

@@ -28,12 +28,8 @@
   <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 elindítva</string>
   <string name="status_service_destroy">Szolgáltatás leállítva</string>
   <string name="status_send_success">Küldés sikeres</string>

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

@@ -28,12 +28,8 @@
   <string name="settings_foreground_title">Service Depan</string>
   <string name="settings_foreground_summary">TIngkatkan Prioritas Service</string>
   <string name="menu_status">Status</string>
-  <string name="menu_about">Tentang</string>
   <string name="menu_shortcuts">Tambah Jalan Pintas</string>
   <string name="menu_clear">Bersihkan</string>
-  <string name="about_description">Aplikasi GPS Untuk Perangkat Android. Kompatibel Dengan Traccar Server Dan Sistem GPS Lainnya.</string>
-  <string name="about_license">Aplikasi Ini Gratis Dan Terbuka, Sumber Kode Berlisensi Dibawah Apache License 2.0 Dan Tersedia di GitHub.</string>
-  <string name="about_web">Untuk Informasi Lebih Lanjut Kunjungi www.traccar.org/client</string>
   <string name="status_service_create">Layanan Dimulai</string>
   <string name="status_service_destroy">Layanan Berhenti</string>
   <string name="status_send_success">Sukses Terkirim</string>

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

@@ -28,12 +28,8 @@
   <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">Informazioni</string>
   <string name="menu_shortcuts">Aggiungi combinazione rapida</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 è 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 avviato</string>
   <string name="status_service_destroy">Servizio fermato</string>
   <string name="status_send_success">Invio riuscito</string>

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

@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name"> Traccar לאנדרויד</string>
+  <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">הפעל שירות </string>
+  <string name="shortcut_stop">עצור תהליך</string>
+  <string name="shortcut_sos">שלח הודעת חירום</string>
+  <string name="channel_default">ערוץ ראשי</string>
+  <string name="settings_id_title">מזהה מכשיר</string>
+  <string name="settings_url_title">כתובת שרת</string>
+  <string name="settings_url_summary">כתובת שרת איתור</string>
+  <string name="settings_interval_title">תדירות</string>
+  <string name="settings_interval_summary">זמן דיווח בשניות </string>
+  <string name="settings_distance_title">מרחק</string>
+  <string name="settings_distance_summary">דיווח מרחק במטרים</string>
+  <string name="settings_angle_title">זווית</string>
+  <string name="settings_angle_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_accuracy_title">דיוק מיקום</string>
+  <string name="settings_accuracy_summary">דיוק מיקום מבוקש</string>
+  <string name="settings_accuracy_high">מדוייק </string>
+  <string name="settings_accuracy_medium">בינוני</string>
+  <string name="settings_accuracy_low">נמוך - משתמש רק בGPS של המכשיר </string>
+  <string name="settings_foreground_title">אפשר הפעלה ברקע</string>
+  <string name="settings_foreground_summary">הגדל את עדיפות התוכנה</string>
+  <string name="menu_status">סטטוס</string>
+  <string name="menu_shortcuts">הוסף קיצור דרך</string>
+  <string name="menu_clear">נקה</string>
+  <string name="status_service_create">אפליקציה הופעלה</string>
+  <string name="status_service_destroy">אפליקציה הופסקה</string>
+  <string name="status_send_success">נשלח בהצלחה</string>
+  <string name="status_send_fail">שליחה נכשלה</string>
+  <string name="status_location_update">עדכון מיקום</string>
+  <string name="status_network_online">רשת באונליין </string>
+  <string name="status_network_offline">רשת מנותקת</string>
+  <string name="hidden_app_name">הגדרות המכשיר</string>
+  <string name="hidden_alert">האפליקציה הוסתרה. כדי לפתוח אותה שוב חייג בטלפון 8722227 (TRACCAR).</string>
+  <string name="error_msg_invalid_url">הזן כתובת חוקית  http:// או  https:// URL</string>
+</resources>

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

@@ -20,6 +20,9 @@
   <string name="settings_status_on">停止</string>
   <string name="settings_status_off_summary">サービス停止中</string>
   <string name="settings_status_on_summary">サービス実行中</string>
+  <string name="settings_buffer">オフラインバッファリング</string>
+  <string name="settings_buffer_off_summary">バッファリング オフ</string>
+  <string name="settings_buffer_on_summary">バッファリング オン</string>
   <string name="settings_accuracy_title">位置情報の精度</string>
   <string name="settings_accuracy_summary">要求される位置情報の精度</string>
   <string name="settings_accuracy_high">高</string>
@@ -28,12 +31,8 @@
   <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 デバイス用のリアルタイム GPS トラッカーです。 Traccar サーバーや他のトラッキングシステムと互換性があります。</string>
-  <string name="about_license">このアプリケーションは無料のオープンソースで、ソースコードは Apache ライセンス バージョン 2.0 でライセンスされます。 GitHub で利用可能です。</string>
-  <string name="about_web">詳細は visit\nwww.traccar.org/client</string>
   <string name="status_service_create">サービスを開始しました</string>
   <string name="status_service_destroy">サービスを停止しました</string>
   <string name="status_send_success">送信に成功しました</string>

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

@@ -12,12 +12,8 @@
   <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 ។ ឆបគ្នាជាមួយនឹងម៉ាស៊ីនបម្រើនិងប្រព័ន្ធតាមដានតាមដានផ្សេងទៀត</string>
-  <string name="about_license">កម្មវិធីនេះត្រូវបានបើកចំហនិងឥតគិតថ្លៃ, កូដប្រភពត្រូវបានទទួលបានអាជ្ញាប័ណ្ណក្រោមអាជ្ញាប័ណ្ណ Apache កំណែ 2.0 និងអាចប្រើបាននៅលើ GitHub ។</string>
-  <string name="about_web">ចំពោះ​​​​​​​​​ព័ត៌មានបន្ថែម\nwww.traccar.org/client</string>
   <string name="status_send_success">ផ្ញើដោយជោគជ័យ</string>
   <string name="status_send_fail">ការផ្ញើបានបរាជ័យ</string>
   <string name="status_location_update">ធ្វើឱ្យទាន់សម័យទីតាំង</string>

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

@@ -1,26 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Traccar 고객</string>
+  <string name="app_name">Traccar 클라이언트</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">서비스 시작</string>
+  <string name="shortcut_stop">서비스 중지</string>
+  <string name="shortcut_sos">SOS 신호 보내기</string>
+  <string name="channel_default">기본 채널</string>
   <string name="settings_id_title">장치 식별자</string>
+  <string name="settings_url_title">서버 URL</string>
+  <string name="settings_url_summary">위치 수집 서버 URL</string>
   <string name="settings_interval_title">주기</string>
+  <string name="settings_interval_summary">위치 수집 주기 (초)</string>
+  <string name="settings_distance_title">거리</string>
+  <string name="settings_distance_summary">최소 위치 수집 기준 거리 (m)</string>
+  <string name="settings_angle_title">각도</string>
+  <string name="settings_angle_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_accuracy_title">위치 정확도</string>
+  <string name="settings_accuracy_summary">위치 수신 정확도</string>
+  <string name="settings_accuracy_high">높음</string>
+  <string name="settings_accuracy_medium">중간</string>
+  <string name="settings_accuracy_low">낮음</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="menu_clear">지우기</string>
-  <string name="about_description">안드로이드 장치를위한 실시간 GPS 추적기. Traccar 서버 및 기타 추적 시스템과 호환됩니다.</string>
+  <string name="status_service_create">서비스 시작됨</string>
-  <string name="about_license">이 응용 프로그램은 무료이며 오픈 소스이며, 소스 코드는 Apache License Version 2.0에서 사용이 허가되며 GitHub에서 사용할 수 있습니다.</string>
+  <string name="status_service_destroy">서비스 중지됨</string>
-  <string name="about_web">더 자세한 정보는  \www.traccar.org/client 를 방문하십시오.</string>
+  <string name="status_send_success">위치 송신 성공</string>
-  <string name="status_send_success">보내기 성공</string>
+  <string name="status_send_fail">위치 송신 실패</string>
-  <string name="status_send_fail">보내기 실패</string>
+  <string name="status_location_update">위치 업데이트됨</string>
-  <string name="status_location_update">위치 수정</string>
+  <string name="status_network_online">네트워크 연결됨</string>
+  <string name="status_network_offline">네트워크 연결 불가</string>
   <string name="hidden_app_name">장치설정</string>
   <string name="hidden_alert">앱이 숨겨져 있습니다. 다시 열려면 8722227 (TRACCAR)로 전화하십시오.</string>
+  <string name="error_msg_invalid_url">올바른 http:// 또는 https:// 형태의 URL 주소를 넣어주세요</string>
 </resources>

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

@@ -12,12 +12,8 @@
   <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">ແອັບໂຕນີ້ສາມາດດາວໂຫລດໃຊ້ໄດ້ຟຣີໂດຍບໍ່ມີຄ່າໃຊ້ຈ່າຍຫຍັງ.</string>
-  <string name="about_web">ຂໍ້ມູນເພີ່ມເຕີມໄດ້ທີ່\nwww.traccar.org/client</string>
   <string name="status_send_fail">ມີຂໍ້ຜິດພາດໃນການສົ່ງຂໍ້ມູນ</string>
   <string name="status_location_update">ສະຖານທີ່ພິກັດໄດ້ອັບເດດ</string>
   <string name="hidden_app_name">ການຕັ້ງຄ່າອຸປະກອນ</string>

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

@@ -28,12 +28,8 @@
   <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 rasite adresu \nwww.traccar.org/client</string>
   <string name="status_service_create">Servisas pradėtas</string>
   <string name="status_service_destroy">Servisas sustabdytas</string>
   <string name="status_send_success">Išsiųsta sėkmingai</string>

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

@@ -28,12 +28,8 @@
   <string name="settings_foreground_title">Zināšanu servis</string>
   <string name="settings_foreground_summary">Paaugstināt servisa prioritāti</string>
   <string name="menu_status">Statuss</string>
-  <string name="menu_about">Par</string>
   <string name="menu_shortcuts">Pievienot saīsnes</string>
   <string name="menu_clear">Notīrīt</string>
-  <string name="about_description">Reāllaika GPS sekošanas ierīce Android ierīcēm. Savietojams ar Traccar Server un citām izsekošanas sistēmām.</string>
-  <string name="about_license">Šī lietotne ir bezmaksas un atvērtā koda, avota kods ir licencēts Apache Licence 2.0 versijā un ir pieejams GitHub.</string>
-  <string name="about_web">Lai iegūtu papildinformāciju, apmeklējiet vietni\nwww.traccar.org/client</string>
   <string name="status_service_create">Serviss uzsākts</string>
   <string name="status_service_destroy">Serviss apstādināts</string>
   <string name="status_send_success">Sūtīšana veiksmīga</string>

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

@@ -20,6 +20,9 @@
   <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_buffer">Frakoblet mellomlagring</string>
+  <string name="settings_buffer_off_summary">Mellomlagring deaktivert</string>
+  <string name="settings_buffer_on_summary">Mellomlagring på</string>
   <string name="settings_accuracy_title">Posisjonsnøyaktighet</string>
   <string name="settings_accuracy_summary">Ønsket plasseringsnøyaktighet</string>
   <string name="settings_accuracy_high">Høy</string>
@@ -28,12 +31,8 @@
   <string name="settings_foreground_title">Forgrunnen tjeneste</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. 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 startet</string>
   <string name="status_service_destroy">Tjeneste stoppet</string>
   <string name="status_send_success">Sending vellykket</string>

app/src/main/res/values-night/colors.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="primary">#2E7D32</color>
+    <color name="primary_dark">#1B5E20</color>
+    <color name="accent">#81C784</color>
+    <color name="light">#FAFAFA</color>
+
+</resources>

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

@@ -28,12 +28,8 @@
   <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 gestart</string>
   <string name="status_service_destroy">Service gestopt</string>
   <string name="status_send_success">Succesvol verstuurd</string>

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

@@ -20,6 +20,9 @@
   <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_buffer">Fråkopla mellomlagring</string>
+  <string name="settings_buffer_off_summary">Mellomlagring deaktivert</string>
+  <string name="settings_buffer_on_summary">Mellomlagring på</string>
   <string name="settings_accuracy_title">Lokasjonsnøyaktighet</string>
   <string name="settings_accuracy_summary">Ønska lokasjonsnøyaktighet</string>
   <string name="settings_accuracy_high">Høg</string>
@@ -28,12 +31,8 @@
   <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 starta</string>
   <string name="status_service_destroy">Teneste stoppa</string>
   <string name="status_send_success">Send vellukka</string>

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

@@ -2,7 +2,7 @@
 <resources>
   <string name="app_name">Traccar Klient</string>
   <string name="app_logo">Traccar</string>
-  <string name="shortcut_start">Start usługi</string>
+  <string name="shortcut_start">Uruchomienie usługi</string>
   <string name="shortcut_stop">Zatrzymanie usługi</string>
   <string name="shortcut_sos">Wyślij SOS</string>
   <string name="channel_default">Podstawowy kanał</string>
@@ -10,16 +10,19 @@
   <string name="settings_url_title">URL Serwera</string>
   <string name="settings_url_summary">URL serwera śledzącego</string>
   <string name="settings_interval_title">Częstotliwość</string>
-  <string name="settings_interval_summary">Interwał raportów w sekundach</string>
+  <string name="settings_interval_summary">Interwał raportowania w sekundach</string>
   <string name="settings_distance_title">Dystans</string>
-  <string name="settings_distance_summary">Dystans raportu w metrach</string>
+  <string name="settings_distance_summary">Dystans raportowania w metrach</string>
   <string name="settings_angle_title">Kąt</string>
-  <string name="settings_angle_summary">Kąt raportu w stopniach</string>
+  <string name="settings_angle_summary">Kąt raportowania w stopniach</string>
   <string name="settings_status_title">Status usługi</string>
   <string name="settings_status_off">Uruchom</string>
   <string name="settings_status_on">Zatrzymaj</string>
   <string name="settings_status_off_summary">Usługa zatrzymana</string>
   <string name="settings_status_on_summary">Usługa uruchomiona</string>
+  <string name="settings_buffer">Buforowanie offline</string>
+  <string name="settings_buffer_off_summary">Buforowanie wył.</string>
+  <string name="settings_buffer_on_summary"> Buforowanie wł.</string>
   <string name="settings_accuracy_title">Dokładność lokalizacji</string>
   <string name="settings_accuracy_summary">Żądana dokładność lokalizacji</string>
   <string name="settings_accuracy_high">Wysoka</string>
@@ -28,13 +31,9 @@
   <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="status_service_create">Usługa uruchomiona</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">Usługa wystartowana</string>
   <string name="status_service_destroy">Usługa zatrzymana</string>
   <string name="status_send_success">Wysłane poprawnie</string>
   <string name="status_send_fail">Wysłanie nieudane</string>

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

@@ -20,6 +20,9 @@
   <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_buffer">Offline buffering</string>
+  <string name="settings_buffer_off_summary">Buffering off</string>
+  <string name="settings_buffer_on_summary">Buffering on</string>
   <string name="settings_accuracy_title">Precisão de localização</string>
   <string name="settings_accuracy_summary">Precisão de localização desejada</string>
   <string name="settings_accuracy_high">Alto</string>
@@ -28,12 +31,8 @@
   <string name="settings_foreground_title">Serviço em primeiro plano</string>
   <string name="settings_foreground_summary">Aumentar a prioridade de serviço</string>
   <string name="menu_status">Status</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 em tempo real para dispositivos Android. Compatível com o Traccar Server e outros sistemas de rastreamento.</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="status_service_create">Serviço iniciado</string>
   <string name="status_service_destroy">Serviço parado</string>
   <string name="status_send_success">Enviado com Sucesso</string>

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

@@ -28,12 +28,8 @@
   <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">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">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="status_service_create">Serviço Iniciado</string>
   <string name="status_service_destroy">Serviço Parado</string>
   <string name="status_send_success">Enviado com Sucesso</string>

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

@@ -2,6 +2,10 @@
 <resources>
   <string name="app_name">Client Traccar</string>
   <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Porneste Serviciu</string>
+  <string name="shortcut_stop">Opreste serviciu</string>
+  <string name="shortcut_sos">Trimite SOS</string>
+  <string name="channel_default">Canal Principal</string>
   <string name="settings_id_title">Identificare dispozitiv</string>
   <string name="settings_url_title">Adresa server</string>
   <string name="settings_url_summary">Adresa serverului de localizare</string>
@@ -16,18 +20,23 @@
   <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_accuracy_title">Acuratete localizare</string>
+  <string name="settings_accuracy_summary">Acuratete dorita pentru localizare</string>
+  <string name="settings_accuracy_high">Inalt</string>
+  <string name="settings_accuracy_medium">Mediu</string>
+  <string name="settings_accuracy_low">Jos</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="status_service_create">Serviciu pornit</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="status_service_destroy">Serviciu oprit</string>
-  <string name="about_web">Pentru mai multe informaţii vizitaţi\nwww.traccar.org/client</string>
   <string name="status_send_success">Expediat</string>
   <string name="status_send_fail">Trimitere eşuată</string>
   <string name="status_location_update">Actualizare locaţie</string>
+  <string name="status_network_online">Retea pornita</string>
+  <string name="status_network_offline">Retea oprita</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>
   <string name="error_msg_invalid_url">Introduceti o adresa valida http:// sau https://</string>

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

@@ -28,12 +28,8 @@
   <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 License Version 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_success">Отправка успешна</string>

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

@@ -12,12 +12,8 @@
   <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_send_fail">යැවිය නොහැකිය</string>
   <string name="status_location_update">Location update</string>
   <string name="hidden_app_name">උපකරණ සැකසුම්</string>

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

@@ -28,12 +28,8 @@
   <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">Služba spustená</string>
   <string name="status_service_destroy">Služba zastavená</string>
   <string name="status_send_success">Úspešne poslané</string>

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

@@ -28,12 +28,8 @@
   <string name="settings_foreground_title">Storitev v ospredju</string>
   <string name="settings_foreground_summary">Povečaj prioriteto storitve</string>
   <string name="menu_status">Stanje</string>
-  <string name="menu_about">O programu</string>
   <string name="menu_shortcuts">Dodaj bližnjice</string>
   <string name="menu_clear">Počisti</string>
-  <string name="about_description">GPS sledilnik v realnem času za naprave Android. Kompatibilno s strežnikom Traccar in drugimi sledilnimi sistemi.</string>
-  <string name="about_license">Ta aplikacija je zastonj in odprtokodna. Izvorna koda je objavljena na GitHub-u z dovoljenjem Apache License verzije 2.0</string>
-  <string name="about_web">Za več informacij obiščite\nwww.traccar.org/client</string>
   <string name="status_service_create">Storitev zagnana</string>
   <string name="status_service_destroy">Storitev ustavljena</string>
   <string name="status_send_success">Pošiljanje uspelo</string>

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

@@ -28,12 +28,8 @@
   <string name="settings_foreground_title">Prvi plan servis</string>
   <string name="settings_foreground_summary">Povecanje usluga prioritet</string>
   <string name="menu_status">Status</string>
-  <string name="menu_about">O klijentu</string>
   <string name="menu_shortcuts">Dodaj prečice</string>
   <string name="menu_clear">Očisti</string>
-  <string name="about_description">GPS tracker za Android telefone. GPS satelit kompatibilno.</string>
-  <string name="about_license">Ova aplikacija je besplatna i open source,izvorni kod je licenciran pod Apache License Version 2.0 i dostupan na GitHub</string>
-  <string name="about_web">Za više informacija www.traccar.org/client </string>
   <string name="status_service_create">Servis pokrenut</string>
   <string name="status_service_destroy">Servis zaustavljen</string>
   <string name="status_send_success">Slanje uspešno</string>

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

@@ -2,29 +2,42 @@
 <resources>
   <string name="app_name">ட்ரக்கர் பணி செயலி</string>
   <string name="app_logo">ட்ரக்கர் </string>
-  <string name="settings_id_title">அடையாளங்காட்டி</string>
+  <string name="shortcut_start">செயலை துவக்கு </string>
-  <string name="settings_url_title">சர்வர் முகவரி</string>
+  <string name="shortcut_stop">செயலை நிறுத்து </string>
+  <string name="shortcut_sos">அவசர உதவி </string>
+  <string name="channel_default">முதன்மை அலைவரிசை </string>
+  <string name="settings_id_title">சாதன அடையாளங்காட்டி</string>
+  <string name="settings_url_title">கணனி பகிர்வான்  முகவரி</string>
   <string name="settings_url_summary">கண்காணிப்பு சர்வர் முகவரி</string>
   <string name="settings_interval_title">இடைவெளி நொடிகள்</string>
   <string name="settings_interval_summary">கண்காணிப்பு இடைவெளி நொடிகளில்</string>
   <string name="settings_distance_title">தூரம்</string>
+  <string name="settings_distance_summary">மீட்டர் தொலைவில் அறிக்கை</string>
   <string name="settings_angle_title">கோணம்</string>
+  <string name="settings_angle_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_accuracy_title">இடம் துல்லியம்</string>
+  <string name="settings_accuracy_summary">விரும்பிய இடம் துல்லியம்</string>
+  <string name="settings_accuracy_high">உயர்</string>
+  <string name="settings_accuracy_medium">நடுத்தர</string>
+  <string name="settings_accuracy_low">குறைந்த</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="status_service_create">சேவை துவங்கியது </string>
-  <string name="about_license">இந்த செயலி பயன்பாட்டை இலவசமாக மற்றும் திறந்த செயலி அபாச்சி பதிப்பு 2.0 முறை மூலம்  வழங்கப்படுகிறது, மேலும் செயலி மூல குறியீடு தரவிறக்கம் கிட்குப்பில் உள்ளது</string>
+  <string name="status_service_destroy">சேவை நிறுத்தப்பட்டது </string>
-  <string name="about_web">மேலும் தகவல்களுக்கு அணுகவும் www.traccar.org/client</string>
+  <string name="status_send_success">வெற்றிகரமாக அனுப்பப்பட்டது </string>
   <string name="status_send_fail">தகவல் அனுப்புதல் தோல்வியுற்றது</string>
   <string name="status_location_update">இடம் மேம்படுத்தல்</string>
+  <string name="status_network_online">வலைத்தொடர்பு உயிர்ப்பு </string>
+  <string name="status_network_offline">வலைத்தொடர்பு துண்டிப்பு </string>
   <string name="hidden_app_name">சாதன அமைப்புகள்</string>
   <string name="hidden_alert">செயலி மறைக்கப்பட்டுள்ளது. அதை காண பின்வரும் எண்ணை அழைக்கவும் 8722227 ( ட்ரக்கர் )</string>
+  <string name="error_msg_invalid_url">சரியான http: // அல்லது https: // URL ஐ உள்ளிடுக</string>
 </resources>

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

@@ -28,12 +28,8 @@
   <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_success">ส่งข้อมูลเรียบร้อย</string>

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

@@ -28,12 +28,8 @@
   <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 Başlatıldı</string>
   <string name="status_service_destroy">Servis Durduruldu</string>
   <string name="status_send_success">Gönderme başarılı</string>

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

@@ -12,12 +12,8 @@
   <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_send_success">Успішно відправлено</string>
   <string name="status_send_fail">Відправлення  невдале</string>
   <string name="status_location_update">Оновлення розташування</string>

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

@@ -19,12 +19,8 @@
   <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_send_success">Gửi thành công</string>
   <string name="status_send_fail">Gửi lỗi</string>
   <string name="status_location_update">Vị trí đã được cập nhật</string>

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

@@ -28,12 +28,8 @@
   <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设备的实时GPS跟踪器。兼容Traccar服务器和其他跟踪系统。</string>
-  <string name="about_license">此应用免费且开源。源码许可为Apache V2.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_success">发送成功</string>

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

@@ -4,6 +4,6 @@
     <color name="primary">#43A047</color>
     <color name="primary_dark">#2E7D32</color>
     <color name="accent">#388E3C</color>
-    <color name="white">#FFFFFF</color>
+    <color name="light">#FFFFFF</color>
 
 </resources>

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

@@ -20,6 +20,9 @@
   <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_buffer">Offline buffering</string>
+  <string name="settings_buffer_off_summary">Buffering off</string>
+  <string name="settings_buffer_on_summary">Buffering on</string>
   <string name="settings_accuracy_title">Location accuracy</string>
   <string name="settings_accuracy_summary">Desired location accuracy</string>
   <string name="settings_accuracy_high">High</string>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>

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

@@ -31,22 +31,29 @@
     <EditTextPreference
         android:defaultValue="300"
         android:key="interval"
-        android:numeric="integer"
+        android:inputType="number"
         android:summary="@string/settings_interval_summary"
         android:title="@string/settings_interval_title" />
 
     <EditTextPreference
         android:defaultValue="0"
         android:key="distance"
-        android:numeric="integer"
+        android:inputType="number"
         android:summary="@string/settings_distance_summary"
         android:title="@string/settings_distance_title" />
 
     <EditTextPreference
         android:defaultValue="0"
         android:key="angle"
-        android:numeric="integer"
+        android:inputType="number"
         android:summary="@string/settings_angle_summary"
         android:title="@string/settings_angle_title" />
 
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="buffer"
+        android:summaryOff="@string/settings_buffer_off_summary"
+        android:summaryOn="@string/settings_buffer_on_summary"
+        android:title="@string/settings_buffer" />
+
 </PreferenceScreen>

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

@@ -2,6 +2,7 @@
 package org.traccar.client;
 
 import android.location.Location;
+import android.os.Build;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -14,6 +15,7 @@ import java.util.Date;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
+@Config(sdk = Build.VERSION_CODES.P)
 @RunWith(RobolectricTestRunner.class)
 public class DatabaseHelperTest {
 

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

@@ -2,6 +2,7 @@
 package org.traccar.client;
 
 import android.location.Location;
+import android.os.Build;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -12,6 +13,7 @@ import java.util.Date;
 
 import static org.junit.Assert.assertEquals;
 
+@Config(sdk = Build.VERSION_CODES.P)
 @RunWith(RobolectricTestRunner.class)
 public class ProtocolFormatterTest {
 

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

@@ -1,6 +1,8 @@
 
 package org.traccar.client;
 
+import android.os.Build;
+
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +11,11 @@ import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.assertTrue;
 
+@Config(sdk = Build.VERSION_CODES.P)
 @RunWith(RobolectricTestRunner.class)
 public class RequestManagerTest {
 
-    @Ignore
+    @Ignore("Not a real unit test")
     @Test
     public void testSendRequest() throws Exception {
 

build.gradle

@@ -2,12 +2,11 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:4.0.0'
-        classpath 'com.google.gms:google-services:4.3.2'
+        classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'io.fabric.tools:gradle:1.26.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
     }
 }
 

gradle.properties

@@ -1,3 +1,2 @@
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableUnitTestBinaryResources=true

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-6.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

translate.py

@@ -5,6 +5,7 @@ import optparse
 import urllib2
 import json
 import base64
+import shutil
 
 parser = optparse.OptionParser()
 parser.add_option("-u", "--user", dest="username", help="transifex user login")
@@ -39,3 +40,8 @@ for language in resource["available_languages"]:
     file = open(filename, "wb")
     file.write(data.read())
     file.close()
+
+filename = path + "values-iw/strings.xml"
+if not os.path.exists(os.path.dirname(filename)):
+    os.makedirs(os.path.dirname(filename))
+shutil.copyfile(path + "values-he/strings.xml", filename)