Merge pull request #105 from Armagetron/translation-german

Updated german translation

traccar-client/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 3
         targetSdkVersion 19
-        versionCode 19
+        versionCode 20
-        versionName "2.12"
+        versionName "3.0"
     }
 
     signingConfigs {

traccar-client/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:allowBackup="true">
+    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:allowBackup="true" android:theme="@style/TraccarTheme">
         
         <activity android:name="TraccarActivity">
             <intent-filter>

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

@@ -24,6 +24,7 @@ import android.location.LocationManager;
 import android.location.LocationProvider;
 import android.os.Bundle;
 import android.os.Handler;
+import android.widget.Toast;
 
 public class PositionProvider {
 
@@ -39,6 +40,7 @@ public class PositionProvider {
     private final LocationManager locationManager;
     private final long period;
     private final PositionListener listener;
+    private final Context context;
 
     private boolean useFine;
     private boolean useCoarse;
@@ -48,6 +50,7 @@ public class PositionProvider {
         locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
         this.period = period;
         this.listener = listener;
+        this.context = context;
 
         // Determine providers
         if (type.equals(PROVIDER_MIXED)) {
@@ -81,6 +84,12 @@ public class PositionProvider {
         private boolean tryProvider(String provider) {
             Location location = locationManager.getLastKnownLocation(provider);
 
+            /*if (location != null) {
+                Toast.makeText(context, "phone: " + new Date() + "\ngps: " + new Date(location.getTime()), Toast.LENGTH_LONG).show();
+            } else {
+                Toast.makeText(context, "no location", Toast.LENGTH_LONG).show();
+            }*/
+            
             if (location != null && new Date().getTime() - location.getTime() <= period + PERIOD_DELTA) {
                 listener.onPositionUpdate(location);
                 return true;

traccar-client/src/main/java/org/traccar/client/TraccarActivity.java

@@ -50,6 +50,9 @@ public class TraccarActivity extends PreferenceActivity {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.preferences);
         initPreferences();
+        SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
+        if (sharedPreferences.getBoolean(KEY_STATUS, false))
+            startService(new Intent(this, TraccarService.class));
     }
 
     @Override
@@ -122,8 +125,6 @@ public class TraccarActivity extends PreferenceActivity {
             sharedPreferences.edit().putString(KEY_ID, id).commit();
         }
         findPreference(KEY_ID).setSummary(sharedPreferences.getString(KEY_ID, id));
-
-        sharedPreferences.edit().putBoolean(KEY_STATUS, isServiceRunning()).commit();
     }
 
 }

traccar-client/src/main/res/values-de/strings.xml

@@ -16,8 +16,8 @@
     <string name="settings_status_on">Stop</string>
     <string name="settings_status_off_summary">Dienst inaktiv</string>
     <string name="settings_status_on_summary">Dienst aktiv</string>
-    <string name="settings_extended_title">Erweiterte Format</string>
+    <string name="settings_extended_title">Erweitertes Format</string>
-    <string name="settings_extended_summary">Verwenden Sie neue Nachrichtenformat</string>
+    <string name="settings_extended_summary">Verwenden Sie das neue Nachrichtenformat</string>
     <string name="settings_provider_title">Datenherkunft</string>
     <string name="settings_provider_summary">Quelle der Positionen</string>
     <string-array name="settings_provider_names">

traccar-client/src/main/res/values-v11/themes.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TraccarTheme" parent="android:Theme.Holo.Light">
+    </style>
+
+</resources>

traccar-client/src/main/res/values/themes.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TraccarTheme" parent="android:Theme.Light">
+    </style>
+
+</resources>