From d5224546c5ea5d378f9e84ddcba517a33d2557b9 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 2 May 2015 12:39:33 +1200
Subject: [PATCH] Fix some lint warnings

---
 .idea/misc.xml                                    | 3 +++
 build.gradle                                      | 2 +-
 traccar-client/build.gradle                       | 4 ++--
 traccar-client/src/main/res/layout/about.xml      | 3 +++
 traccar-client/src/main/res/values-cs/strings.xml | 1 -
 traccar-client/src/main/res/values-da/strings.xml | 1 -
 traccar-client/src/main/res/values-de/strings.xml | 1 -
 traccar-client/src/main/res/values-es/strings.xml | 1 -
 traccar-client/src/main/res/values-fr/strings.xml | 1 -
 traccar-client/src/main/res/values-nb/strings.xml | 1 -
 traccar-client/src/main/res/values-pt/strings.xml | 1 -
 traccar-client/src/main/res/values-ru/strings.xml | 1 -
 traccar-client/src/main/res/values-sr/strings.xml | 1 -
 traccar-client/src/main/res/values/strings.xml    | 1 -
 14 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index c548c97..17262b6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
diff --git a/build.gradle b/build.gradle
index 248e71b..b129b69 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.2.2'
     }
 }
 
diff --git a/traccar-client/build.gradle b/traccar-client/build.gradle
index 08146e0..f773678 100644
--- a/traccar-client/build.gradle
+++ b/traccar-client/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 22
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         minSdkVersion 3
-        targetSdkVersion 21
+        targetSdkVersion 22
         versionCode 20
         versionName "3.0"
     }
diff --git a/traccar-client/src/main/res/layout/about.xml b/traccar-client/src/main/res/layout/about.xml
index 3401eef..41eb3df 100644
--- a/traccar-client/src/main/res/layout/about.xml
+++ b/traccar-client/src/main/res/layout/about.xml
@@ -8,8 +8,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:layout_marginLeft="@dimen/about_margin"
+        android:layout_marginStart="@dimen/about_margin"
         android:layout_marginTop="@dimen/about_margin"
         android:src="@drawable/ic_launcher"
         android:contentDescription="@string/app_logo" />
@@ -19,6 +21,7 @@
         android:layout_height="fill_parent"
         android:layout_margin="@dimen/about_margin"
         android:layout_toRightOf="@+id/logo"
+        android:layout_toEndOf="@+id/logo"
         android:orientation="vertical" >
 
         <TextView
diff --git a/traccar-client/src/main/res/values-cs/strings.xml b/traccar-client/src/main/res/values-cs/strings.xml
index 5aff988..6dd6128 100644
--- a/traccar-client/src/main/res/values-cs/strings.xml
+++ b/traccar-client/src/main/res/values-cs/strings.xml
@@ -35,7 +35,6 @@
     <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_start">Služba spuštěna</string>
     <string name="status_service_destroy">Služba zastavena</string>
     <string name="status_connection_success">Spojení se zdařilo</string>
     <string name="status_connection_fail">Spojení selhalo</string>
diff --git a/traccar-client/src/main/res/values-da/strings.xml b/traccar-client/src/main/res/values-da/strings.xml
index 0b5e043..121098d 100644
--- a/traccar-client/src/main/res/values-da/strings.xml
+++ b/traccar-client/src/main/res/values-da/strings.xml
@@ -35,7 +35,6 @@
     <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_start">Service startet</string>
     <string name="status_service_destroy">Service ødelagt</string>
     <string name="status_connection_success">Forbindelse lykkedes</string>
     <string name="status_connection_fail">Forbindelse fejlet</string>
diff --git a/traccar-client/src/main/res/values-de/strings.xml b/traccar-client/src/main/res/values-de/strings.xml
index 5264928..0733adc 100644
--- a/traccar-client/src/main/res/values-de/strings.xml
+++ b/traccar-client/src/main/res/values-de/strings.xml
@@ -35,7 +35,6 @@
     <string name="about_web">Für weitere Informationen besuche uns auf \nwww.traccar.org/client</string>
 
     <string name="status_service_create">Dienst installiert</string>
-    <string name="status_service_start">Dienst gestartet</string>
     <string name="status_service_destroy">Dienst zerstört</string>
     <string name="status_connection_success">Verbindung erfolgreich</string>
     <string name="status_connection_fail">Verbindung fehlerhaft</string>
diff --git a/traccar-client/src/main/res/values-es/strings.xml b/traccar-client/src/main/res/values-es/strings.xml
index d4fde2a..5bea749 100644
--- a/traccar-client/src/main/res/values-es/strings.xml
+++ b/traccar-client/src/main/res/values-es/strings.xml
@@ -35,7 +35,6 @@
     <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_start">Service arrancado</string>
     <string name="status_service_destroy">Servicio destruído</string>
     <string name="status_connection_success">Conexión realizada</string>
     <string name="status_connection_fail">Fallo en la conexión</string>
diff --git a/traccar-client/src/main/res/values-fr/strings.xml b/traccar-client/src/main/res/values-fr/strings.xml
index 347b6ae..f09bfb6 100644
--- a/traccar-client/src/main/res/values-fr/strings.xml
+++ b/traccar-client/src/main/res/values-fr/strings.xml
@@ -35,7 +35,6 @@
     <string name="about_web">Pour plus d’information, visitez le site: \nwww.traccar.org/client</string>
 
     <string name="status_service_create">Service créé</string>
-    <string name="status_service_start">Service démarré</string>
     <string name="status_service_destroy">Service supprimé</string>
     <string name="status_connection_success">Connexion établie avec le serveur</string>
     <string name="status_connection_fail">Echec de la connexion au serveur</string>
diff --git a/traccar-client/src/main/res/values-nb/strings.xml b/traccar-client/src/main/res/values-nb/strings.xml
index a9ed4da..6c69c9c 100644
--- a/traccar-client/src/main/res/values-nb/strings.xml
+++ b/traccar-client/src/main/res/values-nb/strings.xml
@@ -35,7 +35,6 @@
     <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_start">Tjeneste startet</string>
     <string name="status_service_destroy">Tjeneste ødelagt</string>
     <string name="status_connection_success">Tilkobling var vellykket</string>
     <string name="status_connection_fail">Tilkobling mislyktes</string>
diff --git a/traccar-client/src/main/res/values-pt/strings.xml b/traccar-client/src/main/res/values-pt/strings.xml
index 66ea9da..5bddd5c 100644
--- a/traccar-client/src/main/res/values-pt/strings.xml
+++ b/traccar-client/src/main/res/values-pt/strings.xml
@@ -35,7 +35,6 @@
     <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_start">Serviço iniciado</string>
     <string name="status_service_destroy">Serviço destruído</string>
     <string name="status_connection_success">Sucesso na conexão</string>
     <string name="status_connection_fail">Falha na conexão</string>
diff --git a/traccar-client/src/main/res/values-ru/strings.xml b/traccar-client/src/main/res/values-ru/strings.xml
index bbd60d4..7d0b0db 100644
--- a/traccar-client/src/main/res/values-ru/strings.xml
+++ b/traccar-client/src/main/res/values-ru/strings.xml
@@ -35,7 +35,6 @@
     <string name="about_web">Для получения дополнительной информации посетите\nwww.traccar.org/client</string>
 
     <string name="status_service_create">Сервис создан</string>
-    <string name="status_service_start">Сервис запущен</string>
     <string name="status_service_destroy">Сервис удален</string>
     <string name="status_connection_success">Соедниение установлено</string>
     <string name="status_connection_fail">Ошибка установки соединения</string>
diff --git a/traccar-client/src/main/res/values-sr/strings.xml b/traccar-client/src/main/res/values-sr/strings.xml
index 23397a0..afaa04e 100644
--- a/traccar-client/src/main/res/values-sr/strings.xml
+++ b/traccar-client/src/main/res/values-sr/strings.xml
@@ -35,7 +35,6 @@
     <string name="about_web">"Za više informacija www.traccar.org/client "</string>
 
     <string name="status_service_create">Servis kreiran</string>
-    <string name="status_service_start">Servis pokrenut</string>
     <string name="status_service_destroy">Servis uništen</string>
     <string name="status_connection_success">Konekcija uspešna</string>
     <string name="status_connection_fail">Konekcija neuspešna</string>
diff --git a/traccar-client/src/main/res/values/strings.xml b/traccar-client/src/main/res/values/strings.xml
index ad054ea..61d2e34 100644
--- a/traccar-client/src/main/res/values/strings.xml
+++ b/traccar-client/src/main/res/values/strings.xml
@@ -35,7 +35,6 @@
     <string name="about_web">For more information visit\nwww.traccar.org/client</string>
 
     <string name="status_service_create">Service created</string>
-    <string name="status_service_start">Service started</string>
     <string name="status_service_destroy">Service destroyed</string>
     <string name="status_connection_success">Connection succeeded</string>
     <string name="status_connection_fail">Connection failed</string>