Update app version to 3.11

Minimal fault on translation

.gitignore

@@ -1,7 +1,5 @@
 .gradle
 .idea/
 local.properties
-traccar-client-android.iml
+*.iml
-app/app.iml
 build/
-app/build/

app/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '23.0.1'
+    buildToolsVersion '23.0.3'
 
     defaultConfig {
         minSdkVersion 3
         targetSdkVersion 23
-        versionCode 26
+        versionCode 31
-        versionName '3.6'
+        versionName '3.11'
     }
 
     signingConfigs {
@@ -22,9 +22,11 @@ android {
 
     productFlavors {
         regular {
+            applicationId "org.traccar.client"
             buildConfigField "boolean", "HIDDEN_APP", "false"
         }
         hidden {
+            applicationId "org.traccar.client.hidden"
             buildConfigField "boolean", "HIDDEN_APP", "true"
         }
     }
@@ -35,6 +37,10 @@ android {
             signingConfig signingConfigs.release
         }
     }
+
+    lintOptions {
+        checkReleaseBuilds false
+    }
 }
 
 dependencies {

app/src/hidden/AndroidManifest.xml

@@ -8,7 +8,7 @@
         android:label="@string/hidden_app_name"
         tools:replace="label">
 
-        <receiver android:name=".DialLaunchReceiver" >
+        <receiver android:name="org.traccar.client.DialLaunchReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.NEW_OUTGOING_CALL" />
             </intent-filter>

app/src/main/AndroidManifest.xml

@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
     <application
         android:allowBackup="true"
@@ -30,6 +31,13 @@
 
         <activity android:name=".AboutActivity"/>
 
+        <activity
+            android:name=".ShortcutActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
         <service android:name=".TrackingService" />
 
         <service android:name=".TrackingService$HideNotificationService" />

app/src/main/java/org/traccar/client/MainActivity.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.
@@ -16,25 +16,23 @@
 package org.traccar.client;
 
 import android.Manifest;
+import android.app.AlarmManager;
 import android.app.AlertDialog;
-import android.app.Dialog;
+import android.app.PendingIntent;
 import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.pm.PackageManager;
-import android.location.LocationManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
+import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
 import android.preference.TwoStatePreference;
-import android.telephony.TelephonyManager;
+import android.util.Patterns;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -56,6 +54,9 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
 
     private SharedPreferences sharedPreferences;
 
+    private AlarmManager alarmManager;
+    private PendingIntent alarmIntent;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -68,13 +69,62 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
         addPreferencesFromResource(R.xml.preferences);
         initPreferences();
 
+        findPreference(KEY_DEVICE).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                return newValue != null && !newValue.equals("");
+            }
+        });
+        findPreference(KEY_ADDRESS).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO) {
+                    return newValue != null && Patterns.DOMAIN_NAME.matcher((String) newValue).matches();
+                } else {
+                    return newValue != null && !((String) newValue).isEmpty();
+                }
+            }
+        });
+        findPreference(KEY_PORT).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (newValue != null) {
+                    try {
+                        int value = Integer.parseInt((String) newValue);
+                        if (value > 0 && value <= 65536) {
+                            return true;
+                        }
+                    } catch (NumberFormatException e) {
+                    }
+                }
+                return false;
+            }
+        });
+        findPreference(KEY_INTERVAL).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (newValue != null) {
+                    try {
+                        Integer.parseInt((String) newValue);
+                        return true;
+                    } catch (NumberFormatException e) {
+                    }
+                }
+                return false;
+            }
+        });
+
+        alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
+        alarmIntent = PendingIntent.getBroadcast(this, 0, new Intent(this, AutostartReceiver.class), 0);
+
         if (sharedPreferences.getBoolean(KEY_STATUS, false)) {
             startTrackingService(true, false);
         }
     }
 
     private void removeLauncherIcon() {
-        ComponentName componentName = new ComponentName(getPackageName(), getPackageName() + ".Launcher");
+        String className = MainActivity.class.getCanonicalName().replace(".MainActivity", ".Launcher");
+        ComponentName componentName = new ComponentName(getPackageName(), className);
         PackageManager packageManager = getPackageManager();
         if (packageManager.getComponentEnabledSetting(componentName) != PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
             packageManager.setComponentEnabledSetting(
@@ -88,6 +138,20 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
         }
     }
 
+    private void addShortcuts(boolean start, int name) {
+        Intent shortcutIntent = new Intent(Intent.ACTION_MAIN);
+        shortcutIntent.setComponent(new ComponentName(getPackageName(), ShortcutActivity.class.getCanonicalName()));
+        shortcutIntent.putExtra(ShortcutActivity.EXTRA_ACTION, start);
+
+        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));
+        installShortCutIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+                Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher));
+
+        sendBroadcast(installShortCutIntent);
+    }
+
     private boolean hasPermission(String permission) {
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
             return true;
@@ -108,12 +172,11 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
     }
 
     private void setPreferencesEnabled(boolean enabled) {
-        PreferenceScreen preferenceScreen = getPreferenceScreen();
+        findPreference(KEY_DEVICE).setEnabled(enabled);
-        preferenceScreen.findPreference(KEY_DEVICE).setEnabled(enabled);
+        findPreference(KEY_ADDRESS).setEnabled(enabled);
-        preferenceScreen.findPreference(KEY_ADDRESS).setEnabled(enabled);
+        findPreference(KEY_PORT).setEnabled(enabled);
-        preferenceScreen.findPreference(KEY_PORT).setEnabled(enabled);
+        findPreference(KEY_INTERVAL).setEnabled(enabled);
-        preferenceScreen.findPreference(KEY_INTERVAL).setEnabled(enabled);
+        findPreference(KEY_PROVIDER).setEnabled(enabled);
-        preferenceScreen.findPreference(KEY_PROVIDER).setEnabled(enabled);
     }
 
     @Override
@@ -140,6 +203,10 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
         if (item.getItemId() == R.id.status) {
             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);
+            return true;
         } else if (item.getItemId() == R.id.about) {
             startActivity(new Intent(this, AboutActivity.class));
             return true;
@@ -160,7 +227,7 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
 
     private void startTrackingService(boolean checkPermission, boolean permission) {
         if (checkPermission) {
-            Set<String> missingPermissions = new HashSet<String>();
+            Set<String> missingPermissions = new HashSet<>();
             if (!hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
                 missingPermissions.add(Manifest.permission.ACCESS_FINE_LOCATION);
             }
@@ -178,6 +245,8 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
         if (permission) {
             setPreferencesEnabled(false);
             startService(new Intent(this, TrackingService.class));
+            alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,
+                    15000, 15000, alarmIntent);
         } else {
             sharedPreferences.edit().putBoolean(KEY_STATUS, false).commit();
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
@@ -191,6 +260,7 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
     }
 
     private void stopTrackingService() {
+        alarmManager.cancel(alarmIntent);
         stopService(new Intent(this, TrackingService.class));
         setPreferencesEnabled(true);
     }

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

@@ -65,7 +65,7 @@ public abstract class PositionProvider {
     public abstract void stopUpdates();
 
     protected void updateLocation(Location location) {
-        if (location != null && location.getTime() != lastUpdateTime) {
+        if (location != null && location.getTime() - lastUpdateTime >= period) {
             Log.i(TAG, "location new");
             lastUpdateTime = location.getTime();
             listener.onPositionUpdate(new Position(deviceId, location, getBatteryLevel()));

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

@@ -0,0 +1,56 @@
+/*
+ * 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.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.widget.Toast;
+
+public class ShortcutActivity extends Activity {
+
+    public static final String EXTRA_ACTION = "shortcutAction";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        checkShortcutAction(getIntent());
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        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();
+        }
+    }
+
+}

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

@@ -17,6 +17,7 @@ package org.traccar.client;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Handler;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
@@ -33,6 +34,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
 
     private Context context;
     private Handler handler;
+    private SharedPreferences preferences;
 
     private String address;
     private int port;
@@ -44,7 +46,11 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
     private PowerManager.WakeLock wakeLock;
 
     private void lock() {
-        wakeLock.acquire(WAKE_LOCK_TIMEOUT);
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1) {
+            wakeLock.acquire();
+        } else {
+            wakeLock.acquire(WAKE_LOCK_TIMEOUT);
+        }
     }
 
     private void unlock() {
@@ -56,7 +62,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
     public TrackingController(Context context) {
         this.context = context;
         handler = new Handler();
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        preferences = PreferenceManager.getDefaultSharedPreferences(context);
         if (preferences.getString(MainActivity.KEY_PROVIDER, null).equals("mixed")) {
             positionProvider = new MixedPositionProvider(context, this);
         } else {
@@ -77,13 +83,21 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
         if (isOnline) {
             read();
         }
-        positionProvider.startUpdates();
+        try {
+            positionProvider.startUpdates();
+        } catch (SecurityException e) {
+            Log.w(TAG, e);
+        }
         networkManager.start();
     }
 
     public void stop() {
         networkManager.stop();
-        positionProvider.stopUpdates();
+        try {
+            positionProvider.stopUpdates();
+        } catch (SecurityException e) {
+            Log.w(TAG, e);
+        }
         handler.removeCallbacksAndMessages(null);
     }
 
@@ -148,7 +162,11 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
             public void onComplete(boolean success, Position result) {
                 if (success) {
                     if (result != null) {
-                        send(result);
+                        if (result.getDeviceId().equals(preferences.getString(MainActivity.KEY_DEVICE, null))) {
+                            send(result);
+                        } else {
+                            delete(result);
+                        }
                     } else {
                         isWaiting = true;
                     }

app/src/main/res/layout/about.xml

@@ -13,7 +13,7 @@
         android:layout_marginLeft="@dimen/about_margin"
         android:layout_marginStart="@dimen/about_margin"
         android:layout_marginTop="@dimen/about_margin"
-        android:src="@mipmap/ic_launcher"
+        android:src="@drawable/logo"
         android:contentDescription="@string/app_logo" />
 
     <LinearLayout

app/src/main/res/menu/main.xml

@@ -6,9 +6,14 @@
         android:title="@string/menu_status"
         android:showAsAction="always" />
 
+    <item
+        android:id="@+id/shortcuts"
+        android:title="@string/menu_shortcuts"
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/about"
         android:title="@string/menu_about"
-        android:showAsAction="ifRoom" />
+        android:showAsAction="never" />
 
 </menu>

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

@@ -1,43 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
+  <string name="app_name">Traccar klient</string>
-    <string name="app_name">Traccar klient</string>
+  <string name="app_logo">Traccar</string>
-    <string name="app_logo">Traccar</string>
+  <string name="settings_id_title">Identifikátor zařízení</string>
-
+  <string name="settings_address_title">Adresa serveru</string>
-    <string name="settings_id_title">Identifikátor zařízení</string>
+  <string name="settings_address_summary">Doménové jméno nebo IP adresa</string>
-    <string name="settings_address_title">Adresa serveru</string>
+  <string name="settings_port_title">Port</string>
-    <string name="settings_address_summary">Doménové jméno nebo IP adresa</string>
+  <string name="settings_port_summary">TCP port sledovacího serveru</string>
-    <string name="settings_port_title">Port</string>
+  <string name="settings_interval_title">Frekvence</string>
-    <string name="settings_port_summary">TCP port sledovacího serveru</string>
+  <string name="settings_interval_summary">Interval zpráv v sekundách</string>
-    <string name="settings_interval_title">Frekvence</string>
+  <string name="settings_status_title">Stav služby</string>
-    <string name="settings_interval_summary">Interval zpráv v sekundách</string>
+  <string name="settings_status_off">Start</string>
-    <string name="settings_status_title">Stav služby</string>
+  <string name="settings_status_on">Stop</string>
-    <string name="settings_status_off">Start</string>
+  <string name="settings_status_off_summary">Zastaveno</string>
-    <string name="settings_status_on">Stop</string>
+  <string name="settings_status_on_summary">Spuštěno</string>
-    <string name="settings_status_off_summary">Zastaveno</string>
+  <string name="settings_provider_title">Poskytovatel zaměření</string>
-    <string name="settings_status_on_summary">Spuštěno</string>
+  <string name="settings_provider_summary">Zdroj zaměřovacích dat</string>
-    <string name="settings_provider_title">Poskytovatel zaměření</string>
+  <string name="settings_provider_gps">GPS</string>
-    <string name="settings_provider_summary">Zdroj zaměřovacích dat</string>
+  <string name="settings_provider_network">Mobilní síť</string>
-    <string-array name="settings_provider_names">
+  <string name="settings_provider_mixed">Obojí</string>
-        <item>GPS</item>
+  <string name="settings_foreground_title">Popředí služba</string>
-        <item>Mobilní síť</item>
+  <string name="settings_foreground_summary">Zvýšit prioritu služba</string>
-        <item>Obojí</item>
+  <string name="menu_status">Stav</string>
-    </string-array>
+  <string name="menu_about">O aplikaci</string>
-    <string name="settings_foreground_title">Popředí služba</string>
+  <string name="menu_clear">Vyčistit</string>
-    <string name="settings_foreground_summary">Zvýšit prioritu služba</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="menu_status">Stav</string>
+  <string name="about_web">Pro více informací navštivte\nwww.traccar.org/client</string>
-    <string name="menu_about">O aplikaci</string>
+  <string name="status_service_create">Služba vytvořena</string>
-    <string name="menu_clear">Vyčistit</string>
+  <string name="status_service_destroy">Služba zastavena</string>
-    
+  <string name="status_send_fail">Odesílání selhalo</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="status_location_update">Aktualizace pozice</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="status_connectivity_change">Změna připojení</string>
-    <string name="about_web">Pro více informací navštivte\nwww.traccar.org/client</string>
-
-    <string name="status_service_create">Služba vytvořena</string>
-    <string name="status_service_destroy">Služba zastavena</string>
-    <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>
-
 </resources>

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

@@ -1,43 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
+  <string name="app_name">Traccar klient</string>
-    <string name="app_name">Traccar klient</string>
+  <string name="app_logo">Traccar</string>
-    <string name="app_logo">Traccar</string>
+  <string name="settings_id_title">Indentificere Enhed</string>
-
+  <string name="settings_address_title">Server adresse</string>
-    <string name="settings_id_title">Indentificere Enhed</string>
+  <string name="settings_address_summary">Domænenavn eller IP adresse</string>
-    <string name="settings_address_title">Server adresse</string>
+  <string name="settings_port_title">Server port</string>
-    <string name="settings_address_summary">Domænenavn eller IP adresse</string>
+  <string name="settings_port_summary">Tracking server TCP port</string>
-    <string name="settings_port_title">Server port</string>
+  <string name="settings_interval_title">Tracking interval</string>
-    <string name="settings_port_summary">Tracking server TCP port</string>
+  <string name="settings_interval_summary">Besked interval i sekunder</string>
-    <string name="settings_interval_title">Tracking interval</string>
+  <string name="settings_status_title">Service status</string>
-    <string name="settings_interval_summary">Besked interval i sekunder</string>
+  <string name="settings_status_off">Start</string>
-    <string name="settings_status_title">Service status</string>
+  <string name="settings_status_on">Stop</string>
-    <string name="settings_status_off">Start</string>
+  <string name="settings_status_off_summary">Service stoppet</string>
-    <string name="settings_status_on">Stop</string>
+  <string name="settings_status_on_summary">Service er aktiv</string>
-    <string name="settings_status_off_summary">Service stoppet</string>
+  <string name="settings_provider_title">Udbyder</string>
-    <string name="settings_status_on_summary">Service er aktiv</string>
+  <string name="settings_provider_summary">Udbyder lokaliseringsdata</string>
-    <string name="settings_provider_title">Udbyder</string>
+  <string name="settings_provider_gps">GPS udbyder</string>
-    <string name="settings_provider_summary">Udbyder lokaliseringsdata</string>
+  <string name="settings_provider_network">Netværks udbyder</string>
-    <string-array name="settings_provider_names">
+  <string name="settings_provider_mixed">Mixet udbyder</string>
-        <item>GPS udbyder</item>
+  <string name="settings_foreground_title">Forgrunden tjeneste</string>
-        <item>Netværks udbyder</item>
+  <string name="settings_foreground_summary">Øg tjeneste prioritet</string>
-        <item>Mixet udbyder</item>
+  <string name="menu_status">Status</string>
-    </string-array>
+  <string name="menu_about">Om</string>
-    <string name="settings_foreground_title">Forgrunden tjeneste</string>
+  <string name="menu_clear">Tilbage</string>
-    <string name="settings_foreground_summary">Øg tjeneste prioritet</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>
-    <string name="menu_status">Status</string>
+  <string name="about_web">For mere information besøg\nwww.traccar.org/client</string>
-    <string name="menu_about">Om</string>
+  <string name="status_service_create">Service oprettet</string>
-    <string name="menu_clear">Tilbage</string>
+  <string name="status_service_destroy">Service ødelagt</string>
-
+  <string name="status_send_fail">Send fejl</string>
-    <string name="about_description">Real tid`s GPS tracker for Android enheder. Kompatibel med Traccar Server og andre tracking systemer.</string>
+  <string name="status_location_update">Placering opdateret</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>
+  <string name="status_connectivity_change">Connectivity forandring</string>
-    <string name="about_web">For mere information besøg\nwww.traccar.org/client</string>
-
-    <string name="status_service_create">Service oprettet</string>
-    <string name="status_service_destroy">Service ødelagt</string>
-    <string name="status_send_fail">Send fejl</string>
-    <string name="status_location_update">Placering opdateret</string>
-    <string name="status_connectivity_change">Connectivity forandring</string>
-
 </resources>

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

@@ -1,43 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
+  <string name="app_name">Traccar für Android</string>
-    <string name="app_name">Traccar für Android</string>
+  <string name="app_logo">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">Gerätekennung</string>
+  <string name="settings_id_title">Gerätekennung</string>
-    <string name="settings_address_title">Serveradresse</string>
+  <string name="settings_address_title">Serveradresse</string>
-    <string name="settings_address_summary">Domain oder IP Adresse</string>
+  <string name="settings_address_summary">Domain oder IP Adresse</string>
-    <string name="settings_port_title">Serverport</string>
+  <string name="settings_port_title">Serverport</string>
-    <string name="settings_port_summary">Port des Ortungsservers</string>
+  <string name="settings_port_summary">Port des Ortungsservers</string>
-    <string name="settings_interval_title">Frequenz</string>
+  <string name="settings_interval_title">Frequenz</string>
-    <string name="settings_interval_summary">Intervall in Sekunden</string>
+  <string name="settings_interval_summary">Intervall in Sekunden</string>
-    <string name="settings_status_title">Dienststatus</string>
+  <string name="settings_status_title">Dienststatus</string>
-    <string name="settings_status_off">Start</string>
+  <string name="settings_status_off">Start</string>
-    <string name="settings_status_on">Stop</string>
+  <string name="settings_status_on">Stop</string>
-    <string name="settings_status_off_summary">Dienst inaktiv</string>
+  <string name="settings_status_off_summary">Dienst inaktiv</string>
-    <string name="settings_status_on_summary">Dienst aktiv</string>
+  <string name="settings_status_on_summary">Dienst aktiv</string>
-    <string name="settings_provider_title">Datenherkunft</string>
+  <string name="settings_provider_title">Datenherkunft</string>
-    <string name="settings_provider_summary">Quelle der Positionen</string>
+  <string name="settings_provider_summary">Quelle der Positionen</string>
-    <string-array name="settings_provider_names">
+  <string name="settings_provider_gps">GPS</string>
-        <item>GPS</item>
+  <string name="settings_provider_network">Netzwerk</string>
-        <item>Netzwerk</item>
+  <string name="settings_provider_mixed">Gemischt</string>
-        <item>Gemischt</item>
+  <string name="settings_foreground_title">Vordergrund Service</string>
-    </string-array>
+  <string name="settings_foreground_summary">Servicepriorität erhöhen</string>
-    <string name="settings_foreground_title">Vordergrund service</string>
+  <string name="menu_status">Status</string>
-    <string name="settings_foreground_summary">Erhöhen service priorität</string>
+  <string name="menu_about">Über</string>
-
+  <string name="menu_shortcuts">Verknüpfung hinzufügen</string>
-    <string name="menu_status">Status</string>
+  <string name="menu_clear">Leeren</string>
-    <string name="menu_about">Über</string>
+  <string name="about_description">Echtzeit GPS Ortung für Android Geräte. Kompatibel mit Traccar Server und anderen Ortungsservern.</string>
-    <string name="menu_clear">Leeren</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 besuche uns auf www.traccar.org/client</string>
-    <string name="about_description">Echtzeit GPS Ortung für Android Geräte. Kompatibel mit Traccar Server und anderen Ortungsservern.</string>
+  <string name="status_service_create">Dienst installiert</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="status_service_destroy">Dienst gestoppt</string>
-    <string name="about_web">Für weitere Informationen besuche uns auf \nwww.traccar.org/client</string>
+  <string name="status_send_fail">Übertragung fehlerhaft</string>
-
+  <string name="status_location_update">Positionsupdate</string>
-    <string name="status_service_create">Dienst installiert</string>
+  <string name="status_connectivity_change">Anschlusswechsel</string>
-    <string name="status_service_destroy">Dienst zerstört</string>
+  <string name="hidden_app_name">Geräteeinstellungen</string>
-    <string name="status_send_fail">Übertragung fehlerhaft</string>
+  <string name="hidden_alert">Die App wurde versteckt. Um sie wieder zu öffnen, wähle 8722227 (TRACCAR).</string>
-    <string name="status_location_update">Positionsupdate</string>
-    <string name="status_connectivity_change">Anschlusswechsel</string>
-
 </resources>

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

@@ -1,43 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
+  <string name="app_name">Cliente Traccar</string>
-    <string name="app_name">Cliente Traccar</string>
+  <string name="app_logo">Traccar</string>
-    <string name="app_logo">Traccar</string>
+  <string name="settings_id_title">Identificador de Dispositivo</string>
-
+  <string name="settings_address_title">Dirección Servidor</string>
-    <string name="settings_id_title">Identificador de Dispositivo</string>
+  <string name="settings_address_summary">Dominio o Dirección IP</string>
-    <string name="settings_address_title">Dirección Servidor</string>
+  <string name="settings_port_title">Puerto del Servidor</string>
-    <string name="settings_address_summary">Dominio o Dirección IP</string>
+  <string name="settings_port_summary">Puerto TCP del rastreador</string>
-    <string name="settings_port_title">Puerto del Servidor</string>
+  <string name="settings_interval_title">Frecuencia de rastreo</string>
-    <string name="settings_port_summary">Puerto TCP del rastreador</string>
+  <string name="settings_interval_summary">Intervalo de los mensajes, en segundos</string>
-    <string name="settings_interval_title">Frecuencia de rastreo</string>
+  <string name="settings_status_title">Estado del servicio</string>
-    <string name="settings_interval_summary">Intervalo de los mensajes, en segundos</string>
+  <string name="settings_status_off">Activado</string>
-    <string name="settings_status_title">Estado del servicio</string>
+  <string name="settings_status_on">Desactivado</string>
-    <string name="settings_status_off">Activado</string>
+  <string name="settings_status_off_summary">Servicio parado</string>
-    <string name="settings_status_on">Desactivado</string>
+  <string name="settings_status_on_summary">Servicio activado</string>
-    <string name="settings_status_off_summary">Servicio parado</string>
+  <string name="settings_provider_title">Proveedor de localización</string>
-    <string name="settings_status_on_summary">Servicio activado</string>
+  <string name="settings_provider_summary">Fuente de los datos de localización</string>
-    <string name="settings_provider_title">Proveedor de localización</string>
+  <string name="settings_provider_gps">Proveedor GPS</string>
-    <string name="settings_provider_summary">Fuente de los datos de localización</string>
+  <string name="settings_provider_network">Proveedor de red</string>
-    <string-array name="settings_provider_names">
+  <string name="settings_provider_mixed">Proveedor mixto</string>
-        <item>Proveedor GPS</item>
+  <string name="settings_foreground_title">Servicio de primer plano</string>
-        <item>Proveedor de red</item>
+  <string name="settings_foreground_summary">Aumentar prioridad de servicio</string>
-        <item>Proveedor mixto</item>
+  <string name="menu_status">Estado</string>
-	</string-array>
+  <string name="menu_about">Acerca de…</string>
-    <string name="settings_foreground_title">Servicio de primer plano</string>
+  <string name="menu_clear">Limpiar</string>
-    <string name="settings_foreground_summary">Aumentar prioridad de servicio</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="menu_status">Estado</string>
+  <string name="about_web">Para más información visite\nwww.traccar.org/client</string>
-    <string name="menu_about">Acerca de&#8230;</string>
+  <string name="status_service_create">Servicio creado</string>
-    <string name="menu_clear">Limpiar</string>
+  <string name="status_service_destroy">Servicio destruído</string>
-    
+  <string name="status_send_fail">Error en el envío</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="status_location_update">Posición actualizada</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="status_connectivity_change">Cambio conectividad</string>
-    <string name="about_web">Para más información visite\nwww.traccar.org/client</string>
-
-    <string name="status_service_create">Servicio creado</string>
-    <string name="status_service_destroy">Servicio destruído</string>
-    <string name="status_send_fail">Erro en el envío</string>
-    <string name="status_location_update">Posición actualizada</string>
-    <string name="status_connectivity_change">Cambio conectividad</string>
-
 </resources>

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

@@ -1,43 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
+  <string name="app_name">Client Traccar</string>
-    <string name="app_name">Traccar</string>
+  <string name="app_logo">Traccar</string>
-    <string name="app_logo">Traccar</string>
+  <string name="shortcut_start">Traccar - Départ</string>
-
+  <string name="shortcut_stop">Traccar - Arrêt</string>
-    <string name="settings_id_title">Identifiant du périphérique</string>
+  <string name="settings_id_title">Identifiant du périphérique</string>
-    <string name="settings_address_title">Adresse du serveur</string>
+  <string name="settings_address_title">Adresse du serveur</string>
-    <string name="settings_address_summary">Nom de domaine ou adresse IP</string>
+  <string name="settings_address_summary">Nom de domaine ou adresse IP</string>
-    <string name="settings_port_title">Port du serveur</string>
+  <string name="settings_port_title">Port du serveur</string>
-    <string name="settings_port_summary">Port TCP du serveur</string>
+  <string name="settings_port_summary">Port TCP du serveur</string>
-    <string name="settings_interval_title">Fréquence</string>
+  <string name="settings_interval_title">Fréquence</string>
-    <string name="settings_interval_summary">Fréquence d\'envoi de la localisation en secondes</string>
+  <string name="settings_interval_summary">Fréquence d\'envoi de la localisation en secondes</string>
-    <string name="settings_status_title">Statut</string>
+  <string name="settings_status_title">Statut</string>
-    <string name="settings_status_off">Démarrer</string>
+  <string name="settings_status_off">Démarrer</string>
-    <string name="settings_status_on">Arrêter</string>
+  <string name="settings_status_on">Arrêter</string>
-    <string name="settings_status_off_summary">Arrêté</string>
+  <string name="settings_status_off_summary">Arrêté</string>
-    <string name="settings_status_on_summary">En marche</string>
+  <string name="settings_status_on_summary">En marche</string>
-    <string name="settings_provider_title">Source de localisation</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_summary">Source utilisée par le système afin d\'obtenir la localisation de l\'appareil</string>
-    <string-array name="settings_provider_names">
+  <string name="settings_provider_gps">Mode GPS uniquement</string>
-        <item>Mode GPS uniquement</item>
+  <string name="settings_provider_network">Mode cellulaire uniquement</string>
-        <item>Mode cellulaire uniquement</item>
+  <string name="settings_provider_mixed">Mode hybride</string>
-        <item>Mode hybride</item>
+  <string name="settings_foreground_title">Un service de premier plan</string>
-    </string-array>
+  <string name="settings_foreground_summary">Augmenter la priorité de service</string>
-    <string name="settings_foreground_title">Un service de premier plan</string>
+  <string name="menu_status">Etat</string>
-    <string name="settings_foreground_summary">Augmenter la priorité de service</string>
+  <string name="menu_about">A propos</string>
-
+  <string name="menu_shortcuts">Ajouter des raccourcis</string>
-    <string name="menu_status">Etat</string>
+  <string name="menu_clear">Effacer</string>
-    <string name="menu_about">A propos</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="menu_clear">Effacer</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="about_description">Suivi GPS en temps réels d\'appareils Android. Compatible avec le serveur Traccar ainsi que d\'autres plateformes de suivi.</string>
+  <string name="status_service_create">Service créé</string>
-    <string name="about_license">Cette application open source est gratuite. Le code source disponible sur GitHub est sous licence Apache Version 2.0.</string>
+  <string name="status_service_destroy">Service supprimé</string>
-    <string name="about_web">Pour plus d’information, visitez le site: \nwww.traccar.org/client</string>
+  <string name="status_send_fail">L’envoi de localisation a échoué</string>
-
+  <string name="status_location_update">Localisation mise à jour</string>
-    <string name="status_service_create">Service créé</string>
+  <string name="status_connectivity_change">Changement de connectivité</string>
-    <string name="status_service_destroy">Service supprimé</string>
+  <string name="hidden_app_name">Paramètres du périphérique</string>
-    <string name="status_send_fail">L’envoi de localisation a échoué</string>
+  <string name="hidden_alert">Cette application a été cachée. Pour l\'ouvrir à nouveau, composez le 8722227 (TRACCAR)</string>
-    <string name="status_location_update">Localisation mise à jour</string>
-    <string name="status_connectivity_change">Changement de connectivité</string>
-
 </resources>

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

@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Traccar Client</string>
+  <string name="app_logo">Traccar</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_port_title">Porta server</string>
+  <string name="settings_port_summary">Porta TCP del Tracking server</string>
+  <string name="settings_interval_title">Frequenza</string>
+  <string name="settings_interval_summary">Intervallo in secondi tra i messaggi</string>
+  <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_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="menu_status">Stato</string>
+  <string name="menu_about">About</string>
+  <string name="menu_clear">Pulisici</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_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>
+  <string name="status_send_fail">Invio fallito</string>
+  <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>
+</resources>

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

@@ -0,0 +1,40 @@
+<?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_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">ລາວຈີພີເອສຄາຣ໌ສຳລັບແອນດຣອຍ. ສາມາດໃຊ້ໄດ້ກັບລາວຈີພີເອສຄາຣ໌ເຊີເວີ້.</string>
+  <string name="about_license">ແອັບໂຕນີ້ສາມາດດາວໂຫລດໃຊ້ໄດ້ຟຣີໂດຍບໍ່ມີຄ່າໃຊ້ຈ່າຍຫຍັງ.</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-nb/strings.xml

@@ -1,43 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
+  <string name="app_name">Traccar Klient</string>
-    <string name="app_name">Traccar Klient</string>
+  <string name="app_logo">Traccar</string>
-    <string name="app_logo">Traccar</string>
+  <string name="settings_id_title">Enhetsidentifikasjon</string>
-
+  <string name="settings_address_title">Tjeneradresse</string>
-    <string name="settings_id_title">Enhetsidentifikasjon</string>
+  <string name="settings_address_summary">Domenenavn eller IP-adresse</string>
-    <string name="settings_address_title">Tjeneradresse</string>
+  <string name="settings_port_title">Tjenerport</string>
-    <string name="settings_address_summary">Domenenavn eller IP-adresse</string>
+  <string name="settings_port_summary">TCP-port til sporingstjener</string>
-    <string name="settings_port_title">Tjenerport</string>
+  <string name="settings_interval_title">Frekvens</string>
-    <string name="settings_port_summary">TCP-port til sporingstjener</string>
+  <string name="settings_interval_summary">Beskjedintervall i sekunder</string>
-    <string name="settings_interval_title">Frekvens</string>
+  <string name="settings_status_title">Tjeneste-status</string>
-    <string name="settings_interval_summary">Beskjedintervall i sekunder</string>
+  <string name="settings_status_off">Start</string>
-    <string name="settings_status_title">Tjeneste-status</string>
+  <string name="settings_status_on">Stopp</string>
-    <string name="settings_status_off">Start</string>
+  <string name="settings_status_off_summary">Tjenesten stoppet</string>
-    <string name="settings_status_on">Stopp</string>
+  <string name="settings_status_on_summary">Tjenesten kjører</string>
-    <string name="settings_status_off_summary">Tjenesten stoppet</string>
+  <string name="settings_provider_title">Lokaliseringsleverandør</string>
-    <string name="settings_status_on_summary">Tjenesten kjører</string>
+  <string name="settings_provider_summary">Kilde for lokaliseringsdata</string>
-    <string name="settings_provider_title">Lokaliseringsleverandør</string>
+  <string name="settings_provider_gps">GPS-lokalisering</string>
-    <string name="settings_provider_summary">Kilde for lokaliseringsdata</string>
+  <string name="settings_provider_network">Nettverkslokalisering</string>
-    <string-array name="settings_provider_names">
+  <string name="settings_provider_mixed">Blandet lokalisering</string>
-        <item>GPS-lokalisering</item>
+  <string name="settings_foreground_title">Forgrunnen tjeneste</string>
-        <item>Nettverkslokalisering</item>
+  <string name="settings_foreground_summary">Øk tjeneste prioritet</string>
-        <item>Blandet lokalisering</item>
+  <string name="menu_status">Status</string>
-    </string-array>
+  <string name="menu_about">Om</string>
-    <string name="settings_foreground_title">Forgrunnen tjeneste</string>
+  <string name="menu_clear">Tøm</string>
-    <string name="settings_foreground_summary">Øk tjeneste prioritet</string>
+  <string name="about_description">Sanntids GPS-sporing for Android-enheter. Kompatible 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="menu_status">Status</string>
+  <string name="about_web">For mer informasjon besøk\nwww.traccar.org/client</string>
-    <string name="menu_about">Om</string>
+  <string name="status_service_create">Tjeneste opprettet</string>
-    <string name="menu_clear">Tøm</string>
+  <string name="status_service_destroy">Tjeneste ødelagt</string>
-    
+  <string name="status_send_fail">Sending mislyktes</string>
-    <string name="about_description">Sanntids GPS-sporing for Android-enheter. Kompatible med Traccar Server og andre sporingssystemer.</string>
+  <string name="status_location_update">Plassering oppdatert</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="status_connectivity_change">Tilkobling forandret</string>
-    <string name="about_web">For mer informasjon besøk\nwww.traccar.org/client</string>
-
-    <string name="status_service_create">Tjeneste opprettet</string>
-    <string name="status_service_destroy">Tjeneste ødelagt</string>
-    <string name="status_send_fail">Sending mislyktes</string>
-    <string name="status_location_update">Plassering oppdatert</string>
-    <string name="status_connectivity_change">Tilkobling forandret</string>
-
 </resources>

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

@@ -1,43 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
+  <string name="app_name">Cliente Traccar</string>
-    <string name="app_name">Cliente Traccar</string>
+  <string name="app_logo">Traccar</string>
-    <string name="app_logo">Traccar</string>
+  <string name="settings_id_title">Identificador único</string>
-
+  <string name="settings_address_title">Endereço do servidor</string>
-    <string name="settings_id_title">Identificador único</string>
+  <string name="settings_address_summary">Nome do domínio ou endereço IP</string>
-    <string name="settings_address_title">Endereço do servidor</string>
+  <string name="settings_port_title">Porta do servidor</string>
-    <string name="settings_address_summary">Nome do domínio ou endereço IP</string>
+  <string name="settings_port_summary">Porta TCP do servidor de rastreamento</string>
-    <string name="settings_port_title">Porta do servidor</string>
+  <string name="settings_interval_title">Invervalo</string>
-    <string name="settings_port_summary">Porta TCP do servidor de rastreamento</string>
+  <string name="settings_interval_summary">Intervalo entre as mensagens em segundos</string>
-    <string name="settings_interval_title">Invervalo</string>
+  <string name="settings_status_title">Status do Serviço</string>
-    <string name="settings_interval_summary">Intervalo entre as mensagens em segundos</string>
+  <string name="settings_status_off">Iniciar</string>
-    <string name="settings_status_title">Status do Serviço</string>
+  <string name="settings_status_on">Parar</string>
-    <string name="settings_status_off">Iniciar</string>
+  <string name="settings_status_off_summary">Serviço Parado</string>
-    <string name="settings_status_on">Parar</string>
+  <string name="settings_status_on_summary">Serviço em execução</string>
-    <string name="settings_status_off_summary">Serviço Parado</string>
+  <string name="settings_provider_title">Provedor de localização</string>
-    <string name="settings_status_on_summary">Serviço em execução</string>
+  <string name="settings_provider_summary">Fonte dos dados de localização</string>
-    <string name="settings_provider_title">Provedor de localização</string>
+  <string name="settings_provider_gps">Provedor GPS</string>
-    <string name="settings_provider_summary">Fonte dos dados de localização</string>
+  <string name="settings_provider_network">Provedor Rede</string>
-    <string-array name="settings_provider_names">
+  <string name="settings_provider_mixed">Provedor Misto</string>
-        <item>Provedor GPS</item>
+  <string name="settings_foreground_title">Serviço primeiro plano</string>
-        <item>Provedor Rede</item>
+  <string name="settings_foreground_summary">Aumentar a prioridade de serviço</string>
-        <item>Provedor Misto</item>
+  <string name="menu_status">Status</string>
-    </string-array>
+  <string name="menu_about">Sobre</string>
-    <string name="settings_foreground_title">Serviço primeiro plano</string>
+  <string name="menu_clear">Limpar</string>
-    <string name="settings_foreground_summary">Aumentar a prioridade de serviço</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_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="menu_status">Status</string>
+  <string name="about_web">Para mais informações visite\nwww.traccar.org/client</string>
-    <string name="menu_about">Sobre</string>
+  <string name="status_service_create">Serviço criado</string>
-    <string name="menu_clear">Limpar</string>
+  <string name="status_service_destroy">Serviço destruído</string>
-    
+  <string name="status_send_fail">Falha no envio</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="status_location_update">Localização atualizada</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="status_connectivity_change">Mudança de conectividade</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>
-
 </resources>

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

@@ -1,43 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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="app_logo">Traccar</string>
+  <string name="settings_id_title">Идентификатор устройства</string>
-
+  <string name="settings_address_title">Адрес сервера</string>
-    <string name="settings_id_title">Идентификатор устройства</string>
+  <string name="settings_address_summary">Домен или IP адрес</string>
-    <string name="settings_address_title">Адрес сервера</string>
+  <string name="settings_port_title">Порт сервера</string>
-    <string name="settings_address_summary">Домен или IP адрес</string>
+  <string name="settings_port_summary">TCP порт мониторингового сервера</string>
-    <string name="settings_port_title">Порт сервера</string>
+  <string name="settings_interval_title">Частота</string>
-    <string name="settings_port_summary">TCP порт мониторингового сервера</string>
+  <string name="settings_interval_summary">Интервал между сообщениями в секундах</string>
-    <string name="settings_interval_title">Частота</string>
+  <string name="settings_status_title">Состояние сервиса</string>
-    <string name="settings_interval_summary">Интервал между сообщениями в секундах</string>
+  <string name="settings_status_off">Старт</string>
-    <string name="settings_status_title">Состояние сервиса</string>
+  <string name="settings_status_on">Стоп</string>
-    <string name="settings_status_off">Старт</string>
+  <string name="settings_status_off_summary">Сервис остановлен</string>
-    <string name="settings_status_on">Стоп</string>
+  <string name="settings_status_on_summary">Сервис запущен</string>
-    <string name="settings_status_off_summary">Сервис остановлен</string>
+  <string name="settings_provider_title">Провайдер местоположения</string>
-    <string name="settings_status_on_summary">Сервис запущен</string>
+  <string name="settings_provider_summary">Источник данных о местоположении</string>
-    <string name="settings_provider_title">Провайдер местоположения</string>
+  <string name="settings_provider_gps">GPS провайдер</string>
-    <string name="settings_provider_summary">Источник данных о местоположении</string>
+  <string name="settings_provider_network">Сетевой провайдер</string>
-    <string-array name="settings_provider_names">
+  <string name="settings_provider_mixed">Смешанный провайдер</string>
-        <item>GPS провайдер</item>
+  <string name="settings_foreground_title">Приоритетный сервис</string>
-        <item>Сетевой провайдер</item>
+  <string name="settings_foreground_summary">Увеличить приоритет сервиса</string>
-        <item>Смешанный провайдер</item>
+  <string name="menu_status">Состояние</string>
-    </string-array>
+  <string name="menu_about">О программе</string>
-    <string name="settings_foreground_title">Приоритетный сервис</string>
+  <string name="menu_clear">Очистить</string>
-    <string name="settings_foreground_summary">Увеличить приоритет сервиса</string>
+  <string name="about_description">Трекер для Android устройств. Совместим с Traccar сервером и другими мониторинговыми системами.</string>
-
+  <string name="about_license">Это приложение распростаняется бесплатно, исходный код распростаняется по лицензии Apache License Version 2.0 и доступен на GitHub.</string>
-    <string name="menu_status">Состояние</string>
+  <string name="about_web">Для получения дополнительной информации посетите\nwww.traccar.org/client</string>
-    <string name="menu_about">О программе</string>
+  <string name="status_service_create">Сервис создан</string>
-    <string name="menu_clear">Очистить</string>
+  <string name="status_service_destroy">Сервис удален</string>
-    
+  <string name="status_send_fail">Ошибка отправки</string>
-    <string name="about_description">Трекер для Android устройств. Совместим с Traccar сервером и другими мониторинговыми системами.</string>
+  <string name="status_location_update">Обновление местоположения</string>
-    <string name="about_license">Это приложение распростаняется бесплатно, исходный код распростаняется по лицензии Apache License Version 2.0 и доступен на GitHub.</string>
+  <string name="status_connectivity_change">Изменение подключения</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>
-
 </resources>

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

@@ -1,43 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
+  <string name="app_name">Traccar klijent</string>
-    <string name="app_name">Traccar klijent</string>
+  <string name="app_logo">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">Identifikator uređaja</string>
+  <string name="settings_id_title">Identifikator uređaja</string>
-    <string name="settings_address_title">Adresa servera</string>
+  <string name="settings_address_title">Adresa servera</string>
-    <string name="settings_address_summary">Domen ime ili IP adresa</string>
+  <string name="settings_address_summary">Domen ime ili IP adresa</string>
-    <string name="settings_port_title">Server port</string>
+  <string name="settings_port_title">Server port</string>
-    <string name="settings_port_summary">TCP port servera</string>
+  <string name="settings_port_summary">TCP port servera</string>
-    <string name="settings_interval_title">Učestalost</string>
+  <string name="settings_interval_title">Učestalost</string>
-    <string name="settings_interval_summary">Interval podataka u sekundama</string>
+  <string name="settings_interval_summary">Interval podataka u sekundama</string>
-    <string name="settings_status_title">Status servisa</string>
+  <string name="settings_status_title">Status servisa</string>
-    <string name="settings_status_off">Start</string>
+  <string name="settings_status_off">Start</string>
-    <string name="settings_status_on">Stop</string>
+  <string name="settings_status_on">Stop</string>
-    <string name="settings_status_off_summary">Servis zaustavljen</string>
+  <string name="settings_status_off_summary">Servis zaustavljen</string>
-    <string name="settings_status_on_summary">Servis pokrenut</string>
+  <string name="settings_status_on_summary">Servis pokrenut</string>
-    <string name="settings_provider_title">Provajder lokacije</string>
+  <string name="settings_provider_title">Provajder lokacije</string>
-    <string name="settings_provider_summary">Izvor lokacijskih podataka</string>
+  <string name="settings_provider_summary">Izvor lokacijskih podataka</string>
-    <string-array name="settings_provider_names">
+  <string name="settings_provider_gps">GPS provajder</string>
-        <item>GPS provajder</item>
+  <string name="settings_provider_network">Provajder Mreže</string>
-        <item>Provajder Mreže</item>
+  <string name="settings_provider_mixed">Oba zajedno provajdera</string>
-        <item>Oba zajedno provajdera</item>
+  <string name="settings_foreground_title">Prvi plan servis</string>
-    </string-array>
+  <string name="settings_foreground_summary">Povecanje usluga prioritet</string>
-    <string name="settings_foreground_title">Prvi plan servis</string>
+  <string name="menu_status">Status</string>
-    <string name="settings_foreground_summary">Povecanje usluga prioritet</string>
+  <string name="menu_about">O klijentu</string>
-
+  <string name="menu_shortcuts">Dodaj prečice</string>
-    <string name="menu_status">Status</string>
+  <string name="menu_clear">Očisti</string>
-    <string name="menu_about">O klijentu</string>
+  <string name="about_description">GPS tracker za Android telefone. GPS satelit kompatibilno.</string>
-    <string name="menu_clear">Očisti</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="about_description">GPS tracker za Android telefone. GPS satelit kompatibilno.</string>
+  <string name="status_service_create">Servis kreiran</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="status_service_destroy">Servis uništen</string>
-    <string name="about_web">"Za više informacija www.traccar.org/client "</string>
+  <string name="status_send_fail">Slanje neuspešno</string>
-
+  <string name="status_location_update">Ažuriranje lokacije</string>
-    <string name="status_service_create">Servis kreiran</string>
+  <string name="status_connectivity_change">Promenjena konekcija</string>
-    <string name="status_service_destroy">Servis uništen</string>
+  <string name="hidden_app_name">Podešavanja uređaja</string>
-    <string name="status_send_fail">Slanje neuspešno</string>
+  <string name="hidden_alert">Aplikacija je skrivena. Da je otvorite kucajte 8722227 (TRACCAR).</string>
-    <string name="status_location_update">Ažuriranje lokacije</string>
-    <string name="status_connectivity_change">Promenjena konekcija</string>
-
 </resources>

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

@@ -1,46 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
+  <string name="app_name">Traccar Client</string>
-    <string name="app_name">Traccar Client</string>
+  <string name="app_logo">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">Device identifier</string>
+  <string name="settings_id_title">Device identifier</string>
-    <string name="settings_address_title">Server address</string>
+  <string name="settings_address_title">Server address</string>
-    <string name="settings_address_summary">Domain name or IP address</string>
+  <string name="settings_address_summary">Domain name or IP address</string>
-    <string name="settings_port_title">Server port</string>
+  <string name="settings_port_title">Server port</string>
-    <string name="settings_port_summary">Tracking server TCP port</string>
+  <string name="settings_port_summary">Tracking server TCP port</string>
-    <string name="settings_interval_title">Frequency</string>
+  <string name="settings_interval_title">Frequency</string>
-    <string name="settings_interval_summary">Messages interval in seconds</string>
+  <string name="settings_interval_summary">Messages interval in seconds</string>
-    <string name="settings_status_title">Service status</string>
+  <string name="settings_status_title">Service status</string>
-    <string name="settings_status_off">Start</string>
+  <string name="settings_status_off">Start</string>
-    <string name="settings_status_on">Stop</string>
+  <string name="settings_status_on">Stop</string>
-    <string name="settings_status_off_summary">Service stopped</string>
+  <string name="settings_status_off_summary">Service stopped</string>
-    <string name="settings_status_on_summary">Service running</string>
+  <string name="settings_status_on_summary">Service running</string>
-    <string name="settings_provider_title">Location provider</string>
+  <string name="settings_provider_title">Location provider</string>
-    <string name="settings_provider_summary">Source of location data</string>
+  <string name="settings_provider_summary">Source of location data</string>
-    <string-array name="settings_provider_names">
+  <string name="settings_provider_gps">GPS provider</string>
-        <item>GPS provider</item>
+  <string name="settings_provider_network">Network provider</string>
-        <item>Network provider</item>
+  <string name="settings_provider_mixed">Mixed provider</string>
-        <item>Mixed provider</item>
+  <string name="settings_foreground_title">Foreground service</string>
-    </string-array>
+  <string name="settings_foreground_summary">Increase service priority</string>
-    <string name="settings_foreground_title">Foreground service</string>
+  <string name="menu_status">Status</string>
-    <string name="settings_foreground_summary">Increase service priority</string>
+  <string name="menu_about">About</string>
-
+  <string name="menu_shortcuts">Add shortcuts</string>
-    <string name="menu_status">Status</string>
+  <string name="menu_clear">Clear</string>
-    <string name="menu_about">About</string>
+  <string name="about_description">Real time GPS tracker for Android devices. Compatible with Traccar Server and other tracking systems.</string>
-    <string name="menu_clear">Clear</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="about_description">Real time GPS tracker for Android devices. Compatible with Traccar Server and other tracking systems.</string>
+  <string name="status_service_create">Service created</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="status_service_destroy">Service destroyed</string>
-    <string name="about_web">For more information visit\nwww.traccar.org/client</string>
+  <string name="status_send_fail">Send failed</string>
-
+  <string name="status_location_update">Location update</string>
-    <string name="status_service_create">Service created</string>
+  <string name="status_connectivity_change">Connectivity change</string>
-    <string name="status_service_destroy">Service destroyed</string>
+  <string name="hidden_app_name">Device Settings</string>
-    <string name="status_send_fail">Send failed</string>
+  <string name="hidden_alert">The app has been hidden. To open it again please dial 8722227 (TRACCAR).</string>
-    <string name="status_location_update">Location update</string>
-    <string name="status_connectivity_change">Connectivity change</string>
-
-    <string name="hidden_app_name">Device Settings</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/values.xml

@@ -7,4 +7,10 @@
         <item>mixed</item>
     </string-array>
 
+    <string-array name="settings_provider_names">
+        <item>@string/settings_provider_gps</item>
+        <item>@string/settings_provider_network</item>
+        <item>@string/settings_provider_mixed</item>
+    </string-array>
+
 </resources>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Aug 12 13:33:05 NZST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip

translate.py

@@ -0,0 +1,41 @@
+#!/usr/bin/python
+
+import os
+import optparse
+import urllib2
+import json
+import base64
+
+parser = optparse.OptionParser()
+parser.add_option("-u", "--user", dest="username", help="transifex user login")
+parser.add_option("-p", "--password", dest="password", help="transifex user password")
+
+(options, args) = parser.parse_args()
+
+if not options.username or not options.password:
+    parser.error('User name and password are required')
+
+os.chdir(os.path.dirname(os.path.abspath(__file__)))
+
+path = "./app/src/main/res/"
+
+def request(url):
+    req = urllib2.Request(url)
+    auth = base64.encodestring("%s:%s" % (options.username, options.password)).replace("\n", "")
+    req.add_header("Authorization", "Basic %s" % auth)
+    return urllib2.urlopen(req)
+
+resource = json.load(request("https://www.transifex.com/api/2/project/traccar/resource/client-android/?details"))
+
+for language in resource["available_languages"]:
+    code = language["code"]
+    data = request("https://www.transifex.com/api/2/project/traccar/resource/client-android/translation/" + code + "?file")
+    if code == "en":
+        filename = path + "values/strings.xml"
+    else:
+        filename = path + "values-" + code.replace("_", "-") + "/strings.xml"
+    if not os.path.exists(os.path.dirname(filename)):
+        os.makedirs(os.path.dirname(filename))
+    file = open(filename, "wb")
+    file.write(data.read())
+    file.close()