diff --git a/pandora_agents/android/ChangeLog b/pandora_agents/android/ChangeLog
index 30c2b1978a..2769916e04 100644
--- a/pandora_agents/android/ChangeLog
+++ b/pandora_agents/android/ChangeLog
@@ -1,3 +1,107 @@
+2012-08-19 Mark Holland <mark@mark-holland.me.uk>
+
+	* res/layout/drawable-hdpi: Added help and about icons
+	from sdk	
+
+	* res/layout/drawable-ldpi: Added new vector images.
+	Added help and about icons from sdk.
+
+	* res/layout/drawable-mdpi:Added help and about icons
+	from sdk.
+
+	* res/layout/drawable-xhdpi: Added new higher
+	resolution images. Added help and about icons from sdk
+
+	* res/layout/password_choose.xml: UI tweak
+
+	* res/layout/password_create.xml: UI tweak
+
+	* res/layout/setup.xml: Changed webURL id, moved position
+	of task spinner.
+
+	* res/layout/setupnosim.xml: Changed webURL id, moved
+	position of task spinner.
+
+	* res/layout/status.xml: Removed start, stop, show and 
+	hide xml buttons.
+
+	* res/layout/statusnosim.xml: Removed start, stop, show 
+	and hide xml buttons.
+
+	* res/layout/welcome.xml: Added splash screen view with
+	pandroid logo and version 3.0 text.
+
+	* res/values/strings.xml: Changed order of strings to be
+	more structured, removed unused correct_update string,
+	fixed the "..." in loading string, fixed copyright symbol,
+	added strings for seconds, runnning and stopped that were
+	previously hardcoded, fixed apostrophe in don't.
+
+	* res/values-de/strings.xml: Added strings for German locale
+
+	* res/values-es/strings.xml: Added strings for Spanish locale
+	
+	* res/values-fr/strings.xml: Added strings for French locale
+
+	* res/values-it/strings.xml: Added strings for Italian locale
+
+	* res/values-ja/strings.xml: Added strings for Japanese locale
+
+	* res/values-pt/strings.xml: Added strings for Portuguese locale
+
+	* res/values-zh/strings.xml: Added strings for Chinese(simplified)
+	locale
+
+	* src/pandroid/agent/About.java: Changed URL to pandorafms.com from
+	.org
+
+	* src/pandroid/agent/core.java: Changed mobile url variable, 
+
+	* src/pandroid/agent/Installation.java: Added comment explaining class.
+
+	* src/pandroid/agent/PandroidAgent.java: Added splash screen dialog
+	
+	* src/pandroid/agent/PandroidAgentListener.java: Added loading toast on
+	connect, moved contact into an asynctask, added application inventory to
+	xml(app name;version;package name), fixed battery level to work on first
+	connect, made all get methods private.
+
+	* src/pandroid/agent/setup.java: Auto add http:// to mobile web url.
+
+	* src/pandroid/agent/SMSBroadcastReceiver.java: Changed variable name.
+
+	* src/pandroid/agent/status.java: swapped hardcoded strings to ones from
+	res.	
+
+
+2012-08-03 Mark Holland <mark@mark-holland.me.uk>
+
+	* res/layout/password_entry.xml: UI tweaks
+
+	* res/layout/setup.xml: Added mobile console
+	textview and button
+
+	* res/layout/setupnosim.xml: Added mobile console
+	textview and button
+
+	* res/layout/status.xml: Added roaming view
+
+	* res/values/strings.xml: string for roaming, 
+	roaming report, mobile site
+
+	* src/pandroid/agent/core.java: Added variables
+	for roaming and mobile site url
+
+	* src/pandroid/agent/PandroidAgentListener.java: 
+ 	Added roaming report method and variables then add
+	to xml
+
+	* src/pandroid/agent/setup.java: Added mobile site
+	view and full screen password input
+
+	* src/pandroid/agent/status.java: Added roaming view
+
+
 2012-07-09 Mark Holland <mark@mark-holland.me.uk>
 	
 	* AndroidManifest.xml: Added Pandora FMS 
diff --git a/pandora_agents/android/res/drawable-hdpi/about.png b/pandora_agents/android/res/drawable-hdpi/about.png
new file mode 100644
index 0000000000..6a7a1e94a7
Binary files /dev/null and b/pandora_agents/android/res/drawable-hdpi/about.png differ
diff --git a/pandora_agents/android/res/drawable-hdpi/help.png b/pandora_agents/android/res/drawable-hdpi/help.png
new file mode 100644
index 0000000000..a39eff3e29
Binary files /dev/null and b/pandora_agents/android/res/drawable-hdpi/help.png differ
diff --git a/pandora_agents/android/res/drawable-ldpi/about.png b/pandora_agents/android/res/drawable-ldpi/about.png
index 85c1876b5f..55c57d5c54 100644
Binary files a/pandora_agents/android/res/drawable-ldpi/about.png and b/pandora_agents/android/res/drawable-ldpi/about.png differ
diff --git a/pandora_agents/android/res/drawable-ldpi/help.png b/pandora_agents/android/res/drawable-ldpi/help.png
index 723c404a95..f93a4e6402 100644
Binary files a/pandora_agents/android/res/drawable-ldpi/help.png and b/pandora_agents/android/res/drawable-ldpi/help.png differ
diff --git a/pandora_agents/android/res/drawable-ldpi/icon.png b/pandora_agents/android/res/drawable-ldpi/icon.png
index 2d43faded0..2b990fd21e 100755
Binary files a/pandora_agents/android/res/drawable-ldpi/icon.png and b/pandora_agents/android/res/drawable-ldpi/icon.png differ
diff --git a/pandora_agents/android/res/drawable-ldpi/logo.png b/pandora_agents/android/res/drawable-ldpi/logo.png
index 67bd55c814..cb4cb2a01a 100644
Binary files a/pandora_agents/android/res/drawable-ldpi/logo.png and b/pandora_agents/android/res/drawable-ldpi/logo.png differ
diff --git a/pandora_agents/android/res/drawable-ldpi/pandroid_large.png b/pandora_agents/android/res/drawable-ldpi/pandroid_large.png
new file mode 100644
index 0000000000..92c3c6f166
Binary files /dev/null and b/pandora_agents/android/res/drawable-ldpi/pandroid_large.png differ
diff --git a/pandora_agents/android/res/drawable-mdpi/about.png b/pandora_agents/android/res/drawable-mdpi/about.png
new file mode 100644
index 0000000000..18b15b5add
Binary files /dev/null and b/pandora_agents/android/res/drawable-mdpi/about.png differ
diff --git a/pandora_agents/android/res/drawable-mdpi/help.png b/pandora_agents/android/res/drawable-mdpi/help.png
new file mode 100644
index 0000000000..010577feda
Binary files /dev/null and b/pandora_agents/android/res/drawable-mdpi/help.png differ
diff --git a/pandora_agents/android/res/drawable-xhdpi/about.png b/pandora_agents/android/res/drawable-xhdpi/about.png
new file mode 100644
index 0000000000..24ea543733
Binary files /dev/null and b/pandora_agents/android/res/drawable-xhdpi/about.png differ
diff --git a/pandora_agents/android/res/drawable-xhdpi/help.png b/pandora_agents/android/res/drawable-xhdpi/help.png
new file mode 100644
index 0000000000..128c7e807d
Binary files /dev/null and b/pandora_agents/android/res/drawable-xhdpi/help.png differ
diff --git a/pandora_agents/android/res/drawable-xhdpi/logo.png b/pandora_agents/android/res/drawable-xhdpi/logo.png
new file mode 100644
index 0000000000..cb4cb2a01a
Binary files /dev/null and b/pandora_agents/android/res/drawable-xhdpi/logo.png differ
diff --git a/pandora_agents/android/res/drawable-xhdpi/pandroid_large.png b/pandora_agents/android/res/drawable-xhdpi/pandroid_large.png
new file mode 100644
index 0000000000..92c3c6f166
Binary files /dev/null and b/pandora_agents/android/res/drawable-xhdpi/pandroid_large.png differ
diff --git a/pandora_agents/android/res/layout/password_choose.xml b/pandora_agents/android/res/layout/password_choose.xml
index 86394b90c2..4cc08419ec 100644
--- a/pandora_agents/android/res/layout/password_choose.xml
+++ b/pandora_agents/android/res/layout/password_choose.xml
@@ -1,42 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!--
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation; version 2
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details. 



+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/p"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-







-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+    android:layout_height="wrap_content" >
+
+    <Button
+        android:id="@+id/yes_button"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="173dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="88dp"
+        android:text="@string/yes" />
 

-        <Button
-            android:id="@+id/yes_button"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="88dp"
-            android:text="@string/yes" />
-

-        <Button
-            android:id="@+id/no_button"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/yes_button"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="26dp"
-            android:text="@string/no" />
+    <Button
+        android:id="@+id/no_button"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="168dp"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/yes_button"
+        android:layout_alignRight="@+id/yes_button"
+        android:layout_below="@+id/yes_button"
+        android:layout_marginTop="22dp"
+        android:text="@string/no" />
 
-        <CheckBox
-            android:id="@+id/password_checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/no_button"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="14dp"
-            android:text="@string/password_checkbox" />
+    <CheckBox
+        android:id="@+id/password_checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/no_button"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="20dp"
+        android:text="@string/password_checkbox" />
 
-    </RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/pandora_agents/android/res/layout/password_create.xml b/pandora_agents/android/res/layout/password_create.xml
index 5bf368adce..05f618a794 100644
--- a/pandora_agents/android/res/layout/password_create.xml
+++ b/pandora_agents/android/res/layout/password_create.xml
@@ -50,22 +50,21 @@
         android:layout_marginTop="16dp"
         android:ems="10"
         android:inputType="textPassword" />
-

+
+    <TextView
+        android:id="@+id/password_repeat_textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/password_create_field"
+        android:layout_centerHorizontal="true"
+        android:text="@string/password_repeat" />
+
     <TextView
         android:id="@+id/password_create_textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="5dp"
         android:text="@string/password_set" />
-
-    <TextView
-        android:id="@+id/password_repeat_textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/password_create_textView"
-        android:layout_below="@+id/password_create_field"
-        android:text="@string/password_repeat" />
         
 </RelativeLayout>
diff --git a/pandora_agents/android/res/layout/setup.xml b/pandora_agents/android/res/layout/setup.xml
index 179fce2275..6fa600fa3c 100644
--- a/pandora_agents/android/res/layout/setup.xml
+++ b/pandora_agents/android/res/layout/setup.xml
@@ -88,10 +88,10 @@
                     android:id="@+id/field5"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/webname" />
+                    android:text="@string/mobileWebURL" />
 
                 <EditText
-                    android:id="@+id/webNameInput"
+                    android:id="@+id/mobileWebURLInput"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:singleLine="true" />
@@ -126,6 +126,23 @@
                     android:textColor="#bbbbbb"
                     android:textSize="14dip" />
 
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+
+                    <ProgressBar
+                        android:id="@+id/loading_task_anim"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                    <Spinner
+                        android:id="@+id/processes_combo"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
+
                 <CheckBox
                     android:id="@+id/checkMemoryReport"
                     android:layout_width="wrap_content"
@@ -253,30 +270,8 @@
                     android:text="@string/RoamingReport"
                     android:textColor="#bbbbbb"
                     android:textSize="14dip" />
-
-                <TextView
-                    android:id="@+id/field5"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/task" />
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
-
-                    <ProgressBar
-                        android:id="@+id/loading_task_anim"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-
-                    <Spinner
-                        android:id="@+id/processes_combo"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:visibility="gone" />
-                </LinearLayout>
-
+                
+                
                 <Button
                     android:id="@+id/set_password"
                     android:layout_width="fill_parent"
diff --git a/pandora_agents/android/res/layout/setupnosim.xml b/pandora_agents/android/res/layout/setupnosim.xml
index 396fc87e56..347e75cffc 100644
--- a/pandora_agents/android/res/layout/setupnosim.xml
+++ b/pandora_agents/android/res/layout/setupnosim.xml
@@ -88,10 +88,10 @@
                     android:id="@+id/field5"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/webname" />
+                    android:text="@string/mobileWebURL" />
 
                 <EditText
-                    android:id="@+id/webNameInput"
+                    android:id="@+id/mobileWebURLInput"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:singleLine="true" />
@@ -133,6 +133,23 @@
                     android:text="@string/taskReport"
                     android:textColor="#bbbbbb"
                     android:textSize="14dip" />
+                
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+
+                    <ProgressBar
+                        android:id="@+id/loading_task_anim"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                    <Spinner
+                        android:id="@+id/processes_combo"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <CheckBox
                     android:id="@+id/checkDeviceUpTimeReport"
@@ -156,22 +173,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/task" />
 
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
-
-                    <ProgressBar
-                        android:id="@+id/loading_task_anim"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-
-                    <Spinner
-                        android:id="@+id/processes_combo"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:visibility="gone" />
-                </LinearLayout>
+                
 
                 <Button
                     android:id="@+id/set_password"
diff --git a/pandora_agents/android/res/layout/status.xml b/pandora_agents/android/res/layout/status.xml
index d62acd05b9..81705f36f2 100644
--- a/pandora_agents/android/res/layout/status.xml
+++ b/pandora_agents/android/res/layout/status.xml
@@ -493,7 +493,7 @@
 		    </TableLayout>
 
 	
-
+			<!--
 		    <Button
 		        android:id="@+id/start"
 		        android:layout_width="fill_parent"
@@ -518,6 +518,7 @@
 		        android:layout_width="fill_parent"
 		        android:layout_height="wrap_content"
 		        android:gravity="left"
+		        
 		        android:text="..." />
 
 		    <Button
@@ -525,6 +526,7 @@
 		        android:layout_width="fill_parent"
 		        android:layout_height="wrap_content"
 		        android:text="Hide xml" />
+		          -->
 		</LinearLayout>
 
 	</ScrollView>
diff --git a/pandora_agents/android/res/layout/statusnosim.xml b/pandora_agents/android/res/layout/statusnosim.xml
index 030811acfc..a8c38b8448 100644
--- a/pandora_agents/android/res/layout/statusnosim.xml
+++ b/pandora_agents/android/res/layout/statusnosim.xml
@@ -172,7 +172,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 			/>
-			
+			<!-- 
 			<Button
 				android:id="@+id/start" 
 				android:layout_alignParentBottom="true"
@@ -205,7 +205,7 @@
 			    android:layout_height="wrap_content"
 			    android:text="Hide xml"
 			/>
-			
+			-->
 		    
 		</LinearLayout>
 	</ScrollView>
diff --git a/pandora_agents/android/res/layout/welcome.xml b/pandora_agents/android/res/layout/welcome.xml
new file mode 100644
index 0000000000..025534f285
--- /dev/null
+++ b/pandora_agents/android/res/layout/welcome.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/welcome"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+




+    <ImageView
+        android:id="@+id/ImageView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="false"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:contentDescription="Pandroid logo"
+        android:paddingTop="20px"
+        android:src="@drawable/pandroid_large" />
+




+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/ImageView1"
+        android:layout_centerHorizontal="true"
+        android:paddingTop="20px"
+        android:text="Version 3.0"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textSize="40px" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/pandora_agents/android/res/values-de/strings.xml b/pandora_agents/android/res/values-de/strings.xml
new file mode 100644
index 0000000000..f90e861163
--- /dev/null
+++ b/pandora_agents/android/res/values-de/strings.xml
@@ -0,0 +1,144 @@
+<!--
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation; version 2
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details. 
+--><resources>
+	<string name="const_string_preferences">"PANDROID_DATA"</string>
+
+	<string name="status_str">"Status"</string>
+	<string name="setup_str">"Einrichten"</string>
+	<string name="app_name">"Pandroid Agenten"</string>
+	<string name="interval">"Intervall"</string>
+	<string name="update">"Update-Konfiguration."</string>
+	<string name="reset">"Standardwert übernehmen"</string>
+	<string name="serverAddr">"Server-Adresse:"</string>
+	<string name="serverPort">"Serverport"</string>
+	<string name="confTitle">"Pandroid Agent Configuration"</string>
+	<string name="agent">"Verkäufer:"</string>
+	<string name="gpsMode">"GPS-Modus"</string>
+	<string name="gpsCurrent">"Aktuelle Position (hohe Akku Kosten)"</string>
+	<string name="summary">"Aktuelle Konfiguration:"</string>
+	<string name="starStop">"Neu starten"</string>
+	<string name="gpsLast">"Letzte bekannte Position"</string>
+	<string name="loading">"Ladevorgang läuft..."</string>
+	<string name="last_values">"Letzten Werte"</string>
+	<string name="latitude">"Breitengrad"</string>
+	<string name="longitude">"Längengrad"</string>
+	<string name="battery_level">"Akkustand"</string>
+	<string name="orientation">"Ausrichtung"</string>
+	<string name="proximity">"Nähe"</string>
+	<string name="incorrect_update">"Konnte nicht aktualisiert werden Optionen."</string>
+	<string name="task">"Aufgaben"</string>
+	<string name="memory">"Speicher"</string>
+	<string name="help_label_str">"hilfe"</string>
+	<string name="about_label_str">"Über"</string>
+	<string name="licensed_under_gpl_str">"Lizenziert unter GPL v2"</string>
+	<string name="develop_team_str">"Entwickler: Sergio M. Zarzuelo, Miguel de Dios, Mark Holland"</string>
+	<string name="pandroid_agent_str">"Pandroid Agenten"</string>
+	<string name="pandroid_agent_copyright">"Copyright © 2011 Artica"</string>
+	<string name="about_desc">"Pandroid Agenten logo"</string>
+	<string name="help_str">"hilfe"</string>
+	<string formatted="false" name="memory_avaliable_str">"Avaliable:%iKb Total: %iKb"</string>
+	<string name="never_str">"Nie."</string>
+	<string name="now_str">"Jetzt."</string>
+	<string name="seconds_str">"Vor Sekunden"</string>
+	<string name="conctact_error_str">"Kontakt Fehler"</string>
+	<string name="last_contact_str">"Letzter Kontakt:\n"</string>
+	<string name="help_text_str">"
+		Pandroid Agent ist ein Android Pandora FMS Agent für Pandora FMS. &lt;p&gt; Pandora FMS ist ein Allzweck-Monitoring-System. Mit dem android Agent können Sie alle Arten von Informationen von Ihrem Gerät die GPS-Position, wie viel Akku gelassen wird, verfügbaren Speicher auf dem Gerät, die Überwachung zu erhalten, wenn ein Prozess aktiv ist, die Zeit, da das Gerät eingeschaltet wurde, ein HALLO-Signal die Überwachung von Anlagen der App, eine Bestandsaufnahme mit allen installierten Anwendungen aswell als Information für Android-Handys mit einer SIM-Karte, die SIM-Karte ID, die Anzahl der SMS / empfangen worden, ruft die Anzahl der eingehenden / entgangenen / outgoing, das Netzwerk Betreiber und Typ, die Klinke, die mobile Signalstärke, die Anzahl von Bytes / über das Mobilfunknetz gesendet wird. Der komplette Quellcode bereitgestellt. &lt;p&gt; Sehen Sie mehr über Pandora FMS unter &lt;a href=\"http://pandorafms.com\"&gt; http://pandoraFMS.com &lt;/a&gt; &lt;/p&gt;
+	"</string>
+	<string name="start">"anfang"</string>
+	<string name="correct_start">"Verbindung erfolgreich"</string>
+	<string name="config_saved">"Konfiguration erfolgreich gespeichert"</string>
+	<string name="contact_stopped_str">"Agent angehalten"</string>
+	<string name="seconds">"Sekunden"</string>
+	<string name="running">"Laufen"</string>
+	<string name="stopped">"Gestoppt"</string>
+	
+	
+	
+	<string name="sim_id">"Sim ID:"</string>
+	<string name="sim_id_value">""</string>
+	<string name="uptime">"Gerät bis Zeit:"</string>
+	<string name="uptime_value">""</string>
+	<string name="sms_received">"Empfangene SMS: "</string>
+	<string name="sms_received_value">""</string>
+	<string name="sms_sent">"Gesendete SMS: "</string>
+	<string name="sms_sent_value">""</string>
+	<string name="network_operator">"Netzbetreiber:"</string>
+	<string name="network_operator_value">""</string>
+	<string name="network_type">"Netzwerktyp:"</string>
+	<string name="network_type_value">""</string>
+	<string name="phone_type">"Handytyp:"</string>
+	<string name="phone_type_value">""</string>
+	<string name="signal_strength">"Signalstärke:"</string>
+	<string name="signal_strength_value">""</string>
+	<string name="incoming_calls">"Eingehende Anrufe:"</string>
+	<string name="incoming_calls_value">""</string>
+	<string name="missed_calls">"Entgangene Anrufe"</string>
+	<string name="missed_calls_value">""</string>
+	<string name="outgoing_calls">"Abgehende Anrufe:"</string>
+	<string name="outgoing_calls_value">""</string>
+	<string name="receive_bytes">"Empfangene Bytes:"</string>
+	<string name="receive_bytes_value">""</string>
+	<string name="transmit_bytes">"Bytes übertragen:"</string>
+	<string name="transmit_bytes_value">""</string>
+	<string name="roaming">"Roaming:"</string>
+	<string name="roaming_value">""</string>
+	
+	
+	<string name="alert_dialog_password">"Passwort eingeben"</string>
+	<string name="password_no_match">"Die Passwörter stimmen nicht überein."</string>
+	<string name="password_error">"Fehler"</string>
+	<string name="password">"passwort"</string>
+	<string name="password_length">"Kennwort muss länger als 6 Zeichen lang sein!"</string>
+	<string name="password_incorrect">"Falsches Passwort"</string>
+	<string name="password_set">"Set Password (leer lassen für keine)"</string>
+	<string name="password_enter">"Passwort eingeben:"</string>
+	<string name="password_repeat">"Kennwort bestätigen:"</string>
+	<string name="password_choose_text">"Wollen Sie ein Passwort einrichten?"</string>
+	<string name="password_checkbox">"Dont wieder fragen"</string>
+	<string name="password_created">"Kennwort erfolgreich erstellt"</string>
+	<string name="password_removed">"Kein Passwort gesetzt"</string>
+	<string name="set_password">"Erstellen/Passwort ändern"</string>
+	
+	<string name="mobileWebURL">"Mobile-Server URL:"</string>
+	<string name="go_to_web">"Zur mobilen Website"</string>
+	
+	<string name="enter">"Eingangsbereich"</string>
+	<string name="back">"zurück"</string>
+	<string name="yes">"ja"</string>
+	<string name="no">"nein"</string>
+	
+	<string name="simIDReport">"Bericht Sim ID"</string>
+	<string name="gpsReport">"Bericht GPS-Daten"</string>
+	<string name="memoryReport">"Bericht verfügbaren Speicher"</string>
+	<string name="taskReport">"Bericht Aufgabe"</string>
+	<string name="uptimeReport">"Bericht Gerät up-Zeit"</string>
+	<string name="NetworkOperatorReport">"Bericht Netzbetreiber"</string>
+	<string name="NetworkTypeReport">"Bericht Netztyp"</string>
+	<string name="PhoneTypeReport">"Bericht Telefontyp"</string>
+	<string name="SignalStrengthReport">"Bericht Signalstärke"</string>
+	<string name="ReceivedSMSReport">"Bericht Anzahl der empfangenen SMS"</string>
+	<string name="SentSMSReport">"Bericht Anzahl der gesendeten SMS"</string>
+	<string name="IncomingCallsReport">"Bericht Anzahl der eingehenden Anrufe"</string>
+	<string name="MissedCallsReport">"Bericht Anzahl der entgangenen Anrufe"</string>
+	<string name="OutgoingCallsReport">"Bericht Anzahl der ausgehenden Anrufe"</string>
+	<string name="BytesReceivedReport">"Bericht Menge der empfangenen mobilen Daten"</string>
+	<string name="BytesSentReport">"Bericht Menge der gesendeten mobile Daten"</string>
+	<string name="HelloSignalReport">"Bericht hallo Signal"</string>
+	<string name="BatteryLevelReport">"Bericht Akkustand"</string>
+	<string name="RoamingReport">"Melden, wenn Roaming"</string>
+	
+	
+</resources>
\ No newline at end of file
diff --git a/pandora_agents/android/res/values-en/strings.xml b/pandora_agents/android/res/values-en/strings.xml
index 819c4ba53d..5049628ac7 100755
--- a/pandora_agents/android/res/values-en/strings.xml
+++ b/pandora_agents/android/res/values-en/strings.xml
@@ -27,31 +27,28 @@
 	<string name="serverPort">Server Port:</string>
 	<string name="confTitle">Pandroid Agent Configuration</string>
 	<string name="agent">Agent name:</string>
-	<string name="gpsReport">Report GPS data</string>
-	<string name="memoryReport">Report available memory</string>
-	<string name="taskReport">Report task</string>
 	<string name="gpsMode">GPS Mode</string>
 	<string name="gpsCurrent">Current position (high battery cost)</string>
 	<string name="summary">Current configuration:</string>
 	<string name="starStop">Restart</string>
 	<string name="gpsLast">Last known position</string>
-	<string name="loading">Loading...</string>
-	<string name="process">Process</string>
+	<string name="loading">Loading…</string>
 	<string name="last_values">Last values</string>
 	<string name="latitude">Latitude</string>
 	<string name="longitude">Longitude</string>
 	<string name="battery_level">Battery Level</string>
 	<string name="orientation">Orientation</string>
 	<string name="proximity">Proximity</string>
-	<string name="incorrect_update">Unsucessful update options.</string>
-	<string name="correct_update">sucessfully updated configuration.</string>
+	<string name="incorrect_update">Could not update options.</string>
 	<string name="task">Task</string>
 	<string name="memory">Memory</string>
 	<string name="help_label_str">Help</string>
 	<string name="about_label_str">About</string>
 	<string name="licensed_under_gpl_str">Licensed under GPL v2</string>
-	<string name="develop_team_str">Developer: Sergio M. Zarzuelo, Miguel de Dios</string>
+	<string name="develop_team_str">Developers: Sergio M. Zarzuelo, Miguel de Dios, Mark Holland</string>
 	<string name="pandroid_agent_str">Pandroid Agent</string>
+	<string name="pandroid_agent_copyright">Copyright © 2011 Artica</string>
+	<string name="about_desc">Pandroid Agent logo</string>
 	<string name="help_str">Help</string>
 	<string name="memory_avaliable_str" formatted="false">Avaliable: &#37;iKb Total: &#37;iKb</string>
 	<string name="never_str">Never.</string>
@@ -62,17 +59,22 @@
 	<string name="help_text_str">
 		Pandroid Agent is an Android Pandora FMS agent for Pandora FMS. &lt;p&gt;
 		Pandora FMS is a general purpose monitoring system. With the android agent you can get all sorts of information from your device,
-		 the gps location, how much battery is left, available memory on the device, monitoring if a process is acvtive, the time since the device was turned on, a HELLO signal for monitoring installations of the app
-		  aswell as information for android phones with a sim card; the sim card ID, the number of SMS sent/received, the number of calls
+		 the gps location, how much battery is left, available memory on the device, monitoring if a process is active, the time since the device was turned on, a HELLO signal for monitoring installations of the app,
+		 an inventory with all the installed apps aswell as information for android phones with a sim card; the sim card ID, the number of SMS sent/received, the number of calls
 		   incoming/missed/outgoing, the network operator and type, the phone type, the mobile signal strength, the number of bytes sent/received 
-		   over the mobile network. Complete source code is provided.&lt;p&gt;See more about Pandora FMS at &lt;a href=&quot;http://pandorafms.org&quot;&gt;http://pandorafms.org&lt;/a&gt;&lt;/p&gt;
+		   over the mobile network. Complete source code is provided.&lt;p&gt;See more about Pandora FMS at &lt;a href=&quot;http://pandorafms.com&quot;&gt;http://pandoraFMS.com&lt;/a&gt;&lt;/p&gt;
 	</string>
 	<string name="start">Start</string>
 	<string name="correct_start">Connection successful</string>
+	<string name="config_saved">Configuration saved successfully</string>
 	<string name="contact_stopped_str">Agent Stopped</string>
+	<string name="seconds">Seconds</string>
+	<string name="running">Running</string>
+	<string name="stopped">Stopped</string>
+	
+	
 	<string name="sim_id">Sim ID:</string>
 	<string name="sim_id_value"/>
-	<string name="loading_str">Loading...</string>
 	<string name="uptime">Device up time:</string>
 	<string name="uptime_value"/>
 	<string name="sms_received">Received SMS: </string>
@@ -81,7 +83,6 @@
 	<string name="sms_sent_value"/>
 	<string name="network_operator">Network operator:</string>
 	<string name="network_operator_value"/>
-	<string name="simIDReport">Report Sim ID</string>
 	<string name="network_type">Network type:</string>
 	<string name="network_type_value"/>
 	<string name="phone_type">Phone type:</string>
@@ -98,16 +99,52 @@
 	<string name="receive_bytes_value"/>
 	<string name="transmit_bytes">Bytes transmitted:</string>
 	<string name="transmit_bytes_value"/>
+	<string name="roaming">Roaming:</string>
+	<string name="roaming_value"/>
+	
+	
 	<string name="alert_dialog_password">Enter password</string>
 	<string name="password_no_match">Passwords do not match!</string>
 	<string name="password_error">error</string>
 	<string name="password">password</string>
 	<string name="password_length">password must be longer than 6 characters!</string>
 	<string name="password_incorrect">Wrong password!</string>
-	<string name="roaming">Roaming:</string>
-	<string name="roaming_value"/>
-	<string name="RoamingReport">Report if Roaming</string>
-	<string name="webname">Mobile server url:</string>
+	<string name="password_set">Set Password(leave blank for none)</string>
+	<string name="password_enter">Enter Password</string>
+	<string name="password_repeat">Repeat Password</string>
+	<string name="password_choose_text">Do you want to set a password?</string>
+	<string name="password_checkbox">Don\'t ask again</string>
+	<string name="password_created">Password sucessfully created</string>
+	<string name="password_removed">No password set</string>
+	<string name="set_password">Create/Change password</string>
+	
+	
+	<string name="mobileWebURL">Mobile server URL:</string>
 	<string name="go_to_web">View Mobile site</string>
 	
+	<string name="enter">enter</string>
+	<string name="back">back</string>
+	<string name="yes">yes</string>
+	<string name="no">no</string>
+	
+	<string name="simIDReport">Report Sim ID</string>
+	<string name="gpsReport">Report GPS data</string>
+	<string name="memoryReport">Report available memory</string>
+	<string name="taskReport">Report task</string>
+	<string name="uptimeReport">Report device up time</string>
+	<string name="NetworkOperatorReport">Report network operator</string>
+	<string name="NetworkTypeReport">Report network type</string>
+	<string name="PhoneTypeReport">Report phone type</string>
+	<string name="SignalStrengthReport">Report signal strength</string>
+	<string name="ReceivedSMSReport">Report number of received SMS</string>
+	<string name="SentSMSReport">Report number of sent SMS</string>
+	<string name="IncomingCallsReport">Report number of incoming calls</string>
+	<string name="MissedCallsReport">Report number of missed calls</string>
+	<string name="OutgoingCallsReport">Report number of outgoing calls</string>
+	<string name="BytesReceivedReport">Report amount of received mobile data</string>
+	<string name="BytesSentReport">Report amount of sent mobile data</string>
+	<string name="HelloSignalReport">Report Hello Signal</string>
+	<string name="BatteryLevelReport">Report battery level</string>
+	<string name="RoamingReport">Report if roaming</string>
+	
 </resources>
diff --git a/pandora_agents/android/res/values-es/strings.xml b/pandora_agents/android/res/values-es/strings.xml
index a9df3e0462..e182e62fdf 100755
--- a/pandora_agents/android/res/values-es/strings.xml
+++ b/pandora_agents/android/res/values-es/strings.xml
@@ -27,16 +27,12 @@
 	<string name="serverPort">Puerto del server:</string>
 	<string name="confTitle">Configuración del Agente Pandroid</string>
 	<string name="agent">Nombre Agente:</string>
-	<string name="gpsReport">Reporta datos GPS</string>
-	<string name="memoryReport">Reporta estado memoria</string>
-	<string name="taskReport">Reporta tareas</string>
 	<string name="gpsMode">Modo GPS</string>
 	<string name="gpsCurrent">Actual posición (alto consumo de batería)</string>
 	<string name="summary">Configuración actual:</string>
 	<string name="starStop">Reiniciar</string>
 	<string name="gpsLast">Última posición conocida</string>
-	<string name="loading">Cargando...</string>
-	<string name="process">Procesando</string>
+	<string name="loading">Cargando…</string>
 	<string name="last_values">Últimos valores</string>
 	<string name="latitude">Latitud</string>
 	<string name="longitude">Longitud</string>
@@ -44,14 +40,15 @@
 	<string name="orientation">Orientación</string>
 	<string name="proximity">Proximidad</string>
 	<string name="incorrect_update">Incorrecta actulización configuración.</string>
-	<string name="correct_update">Correcta actualización configuración.</string>
 	<string name="task">Tarea</string>
 	<string name="memory">Memoria</string>
 	<string name="help_label_str">Ayuda</string>
 	<string name="about_label_str">Sobre</string>
 	<string name="licensed_under_gpl_str">Licenciado bajo GPL v2</string>
-	<string name="develop_team_str">Desarrolladores: Sergio M. Zarzuelo, Miguel de Dios</string>
+	<string name="develop_team_str">Desarrolladores: Sergio M. Zarzuelo, Miguel de Dios, Mark Holland</string>
 	<string name="pandroid_agent_str">Agente Pandroid</string>
+	<string name="pandroid_agent_copyright">Copyright © 2011 Artica</string>
+	<string name="about_desc">Pandroid Agent logotipo</string>
 	<string name="help_str">Ayuda</string>
 	<string name="memory_avaliable_str" formatted="false">Disponible: &#37;iKb Total: &#37;iKb</string>
 	<string name="never_str">Nunca.</string>
@@ -61,14 +58,24 @@
 	<string name="last_contact_str">Último contacto:\n</string>
 	<string name="help_text_str">
 		Pandroid Agent es un agente en Android para Pandora FMS. &lt;p&gt;
-		Pandora FMS es un sistema de monitorizaci&#243;n de prop&#243;sito general. Con el agente en Android puedes monitorizar GPS, cuanta batería le queda al dispositivo, memoria disponible. Este podrá expandirse en el futuro para reportar si un proceso esta en ejecución, siendo muy útil para sistemas embebidos en servidores centrales. Tambien se puede expandir para obtener información de otras aplicaciones en el dispositivo o hacer otras cosas mas. El código fuente esta disponible.&lt;p&gt;Puedes informarte de esto y mas en Pandora FMS en &lt;a href=&quot;http://pandorafms.org&quot;&gt;http://pandorafms.org&lt;/a&gt;&lt;/p&gt;
+		Pandora FMS es un sistema de monitorizaci&#243;n de prop&#243;sito general. Con el agente en Android puedes monitorizar todo tipo de cosas,
+		 GPS, cuanta batería le queda al dispositivo, memoria disponible, si un proceso está activo, El tiempoe que lleva encendido el dispositivo,
+		un señal de saludo para monotrorizar instalaciones de pandroid, un inventario con información de todos los apps instalados. También
+		datos de moviles, la ID del sim, número de SMS enviados/recibidos, número de llamadas entrantes/perdidas/recibidas, el nombre del operador
+		y el tipo, el tipo de movil, la potencia de señal, el número de bytes enviados/recibidos por la red movil.
+		 El código fuente esta disponible.&lt;p&gt;Puedes informarte de esto y mas en Pandora FMS en &lt;a href=&quot;http://pandorafms.com&quot;&gt;http://pandoraFMS.com&lt;/a&gt;&lt;/p&gt;
 	</string>
 	<string name="start">Iniciar</string>
 	<string name="correct_start">Conexion con exito</string>
+	<string name="config_saved">Configuración guardado con exito</string>
 	<string name="contact_stopped_str">Agente parado</string>
+	<string name="seconds">Segundos</string>
+	<string name="running">En marcha</string>
+	<string name="stopped">Parado</string>
+	
+	
 	<string name="sim_id">Sim ID:</string>
 	<string name="sim_id_value"/>
-	<string name="loading_str">Cargando...</string>
 	<string name="uptime">Tiempo encendido:</string>
 	<string name="uptime_value"/>
 	<string name="sms_received">SMS recibido: </string>
@@ -77,7 +84,6 @@
 	<string name="sms_sent_value"/>
 	<string name="network_operator">Operador:</string>
 	<string name="network_operator_value"/>
-	<string name="simIDReport">Reporta Sim ID</string>
 	<string name="network_type">Tipo red:</string>
 	<string name="network_type_value"/>
 	<string name="phone_type">Tipo movil:</string>
@@ -94,27 +100,37 @@
 	<string name="receive_bytes_value"/>
 	<string name="transmit_bytes">Bytes transmitidos:</string>
 	<string name="transmit_bytes_value"/>
+	<string name="roaming">Roaming:</string>
+	<string name="roaming_value"/>
+	
+	
 	<string name="alert_dialog_password">Introducir contraseña</string>
 	<string name="password_no_match">Las contraseñas son diferentes!</string>
 	<string name="password_error">error</string>
 	<string name="password">contraseña</string>
-	<string name="password_length">La contraseña debe contener mas de 6 caracteres!</string>
+	<string name="password_length">La contraseña debe contener mas de 6 carácteres!</string>
 	<string name="password_incorrect">Contraseña incorrecta</string>
 	<string name="password_set">Crear contraseña</string>
 	<string name="password_enter">Introducir contraseña</string>
 	<string name="password_repeat">Repetir contraseña</string>
 	<string name="password_choose_text">Quieres poner una contraseña?</string>
-	<string name="password_checkbox">No vuelkves a preguntar</string>
+	<string name="password_checkbox">No vuelves a preguntar</string>
 	<string name="password_created">Contraseña creada</string>
 	<string name="password_removed">Sin contraseña</string>
 	<string name="set_password">Crear/Cambiar contraseña</string>
+	
+	<string name="mobileWebURL">URL de servidor movil:</string>
+	<string name="go_to_web">Ver sitio movil</string>
+	
 	<string name="enter">Intro</string>
 	<string name="back">Volver</string>
-	
 	<string name="yes">si</string>
 	<string name="no">no</string>
 	
-	<string name="BatteryLevelReport">Reporta nivel de bateria</string>
+	<string name="simIDReport">Reporta Sim ID</string>
+	<string name="gpsReport">Reporta datos GPS</string>
+	<string name="memoryReport">Reporta estado memoria</string>
+	<string name="taskReport">Reporta tarea</string>
 	<string name="uptimeReport">Reporta tiempo encendido</string>
 	<string name="NetworkOperatorReport">Reporta operador de red</string>
 	<string name="NetworkTypeReport">Reporta tipo de red</string>
@@ -128,5 +144,8 @@
 	<string name="BytesReceivedReport">Reporta bytes recibidos</string>
 	<string name="BytesSentReport">Reporta bytes enviados</string>
 	<string name="HelloSignalReport">Reporta señal de saludo</string>
+	<string name="BatteryLevelReport">Reporta nivel de bateria</string>
+	<string name="RoamingReport">Reporta si Roaming</string>
+	
 	
 </resources>
diff --git a/pandora_agents/android/res/values-fr/strings.xml b/pandora_agents/android/res/values-fr/strings.xml
new file mode 100644
index 0000000000..1c98b517cf
--- /dev/null
+++ b/pandora_agents/android/res/values-fr/strings.xml
@@ -0,0 +1,144 @@
+<!--
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation; version 2
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details. 
+--><resources>
+	<string name="const_string_preferences">"PANDROID_DATA"</string>
+
+	<string name="status_str">"État"</string>
+	<string name="setup_str">"Paramétrer"</string>
+	<string name="app_name">"Agent Pandroid"</string>
+	<string name="interval">"Fréquence :"</string>
+	<string name="update">"Paramètres de mise à jour"</string>
+	<string name="reset">"Définir par Défaut"</string>
+	<string name="serverAddr">"Adresse du serveur:"</string>
+	<string name="serverPort">"Server Port:"</string>
+	<string name="confTitle">"Configuration de l'agent Pandroid"</string>
+	<string name="agent">"Nom de l'agent:"</string>
+	<string name="gpsMode">"Mode GPS"</string>
+	<string name="gpsCurrent">"Position actuelle (coût de la batterie élevée)"</string>
+	<string name="summary">"Configuration actuelle:"</string>
+	<string name="starStop">"Redém."</string>
+	<string name="gpsLast">"Dernière position connue"</string>
+	<string name="loading">"Chargement ..."</string>
+	<string name="last_values">"Dernières valeurs"</string>
+	<string name="latitude">"Latitude"</string>
+	<string name="longitude">"Longitude"</string>
+	<string name="battery_level">"Niveau de charge de la batterie"</string>
+	<string name="orientation">"Orientation"</string>
+	<string name="proximity">"proximité"</string>
+	<string name="incorrect_update">"Impossible de mettre à jour les options."</string>
+	<string name="task">"Tâche"</string>
+	<string name="memory">"Lecteur"</string>
+	<string name="help_label_str">"aide"</string>
+	<string name="about_label_str">"Sur"</string>
+	<string name="licensed_under_gpl_str">"Sous licence GPL v2"</string>
+	<string name="develop_team_str">"Développeurs: Sergio M. Zarzuelo, Miguel de Dios, Mark Holland"</string>
+	<string name="pandroid_agent_str">"Agent Pandroid"</string>
+	<string name="pandroid_agent_copyright">"Copyright © 2011 Artica"</string>
+	<string name="about_desc">"Logo Agent Pandroid"</string>
+	<string name="help_str">"aide"</string>
+	<string formatted="false" name="memory_avaliable_str">"Disponible: %iKb Total: %iKb"</string>
+	<string name="never_str">"Jamais."</string>
+	<string name="now_str">"Maintenant."</string>
+	<string name="seconds_str">"secondes"</string>
+	<string name="conctact_error_str">"Contactez erreur"</string>
+	<string name="last_contact_str">"dernier Contact:\n"</string>
+	<string name="help_text_str">"
+		Agent Pandroid est un Android Pandora FMS agent de Pandora FMS. &lt;p&gt; Pandora FMS est un système de surveillance à usage général. Avec l'agent android vous pouvez obtenir toutes sortes d'informations à partir de votre appareil, l'emplacement gps, combien de batterie est laissée, la mémoire disponible sur l'appareil, suivi si un processus est actif, le temps écoulé depuis l'appareil a été mis sous tension, un signal BONJOUR pour la surveillance des installations de l'application, un inventaire de toutes les applications installées aswell titre d'information pour les téléphones Android avec une carte sim, l'ID de carte SIM, le nombre de SMS envoyés / reçus, le nombre d'appels entrants / manqués / sortant, le réseau l'opérateur et le type, le type de téléphone, le niveau de signal mobile, le nombre d'octets envoyés / reçus sur le réseau mobile. Le code source complet est fourni. &lt;p&gt; Voir plus sur Pandora FMS à &lt;a href=\"http://pandorafms.com\"&gt; http://pandoraFMS.com &lt;/ a&gt; &lt;/ p&gt;
+	"</string>
+	<string name="start">"Commence"</string>
+	<string name="correct_start">"Connexion réussie"</string>
+	<string name="config_saved">"Configuration sauvegardée avec succès"</string>
+	<string name="contact_stopped_str">"Agent arrêté"</string>
+	<string name="seconds">"Secondes"</string>
+	<string name="running">"En marche"</string>
+	<string name="stopped">"Arrêté"</string>
+	
+	
+	
+	<string name="sim_id">"Sim ID:"</string>
+	<string name="sim_id_value">""</string>
+	<string name="uptime">"Dispositif le temps de:"</string>
+	<string name="uptime_value">""</string>
+	<string name="sms_received">"SMS reçus: "</string>
+	<string name="sms_received_value">""</string>
+	<string name="sms_sent">"SMS envoyés: "</string>
+	<string name="sms_sent_value">""</string>
+	<string name="network_operator">"Opérateur de réseau:"</string>
+	<string name="network_operator_value">""</string>
+	<string name="network_type">"Type de réseau :"</string>
+	<string name="network_type_value">""</string>
+	<string name="phone_type">"Type de téléphone:"</string>
+	<string name="phone_type_value">""</string>
+	<string name="signal_strength">"Intensité du signal :"</string>
+	<string name="signal_strength_value">""</string>
+	<string name="incoming_calls">"Appels entrants:"</string>
+	<string name="incoming_calls_value">""</string>
+	<string name="missed_calls">"Appels manqués"</string>
+	<string name="missed_calls_value">""</string>
+	<string name="outgoing_calls">"Appels sortants:"</string>
+	<string name="outgoing_calls_value">""</string>
+	<string name="receive_bytes">"Octets reçus :"</string>
+	<string name="receive_bytes_value">""</string>
+	<string name="transmit_bytes">"Octets transmis:"</string>
+	<string name="transmit_bytes_value">""</string>
+	<string name="roaming">"Itinérance :"</string>
+	<string name="roaming_value">""</string>
+	
+	
+	<string name="alert_dialog_password">"Saisir votre mot de passe"</string>
+	<string name="password_no_match">"Les mots de passe diffèrent."</string>
+	<string name="password_error">"Erreur."</string>
+	<string name="password">"mot de passe"</string>
+	<string name="password_length">"mot de passe doit être plus long que 6 caractères!"</string>
+	<string name="password_incorrect">"Mot de passe incorrect"</string>
+	<string name="password_set">"Définir mot de passe (laisser vide pour aucun)"</string>
+	<string name="password_enter">"Saisir le mot de passe"</string>
+	<string name="password_repeat">"Répéter mot de passe"</string>
+	<string name="password_choose_text">"Ne vous souhaitez définir un mot de passe?"</string>
+	<string name="password_checkbox">"Ne pas demander à nouveau"</string>
+	<string name="password_created">"Mot de passe créé avec succès"</string>
+	<string name="password_removed">"Aucun mot de passe défini"</string>
+	<string name="set_password">"Créer/Modifier le mot de passe"</string>
+	
+	<string name="mobileWebURL">"URL du serveur Mobile:"</string>
+	<string name="go_to_web">"Voir le site mobile"</string>
+	
+	<string name="enter">"Entrer..."</string>
+	<string name="back">"arrière"</string>
+	<string name="yes">"oui"</string>
+	<string name="no">"no"</string>
+	
+	<string name="simIDReport">"Rapport Sim ID"</string>
+	<string name="gpsReport">"Rapport de données GPS"</string>
+	<string name="memoryReport">"Signaler mémoire disponible"</string>
+	<string name="taskReport">"Tâche de rapport"</string>
+	<string name="uptimeReport">"Signaler appareil le temps"</string>
+	<string name="NetworkOperatorReport">"Signaler opérateur de réseau"</string>
+	<string name="NetworkTypeReport">"Rapport type de réseau"</string>
+	<string name="PhoneTypeReport">"Rapport type de téléphone"</string>
+	<string name="SignalStrengthReport">"Rapport puissance du signal"</string>
+	<string name="ReceivedSMSReport">"Rapport du nombre de SMS reçus"</string>
+	<string name="SentSMSReport">"Indiquer le nombre de SMS envoyés"</string>
+	<string name="IncomingCallsReport">"Rapport numéro des appels entrants"</string>
+	<string name="MissedCallsReport">"Rapport numéro des appels manqués"</string>
+	<string name="OutgoingCallsReport">"Numéro de rapport des appels sortants"</string>
+	<string name="BytesReceivedReport">"Rapport du montant reçu données mobiles"</string>
+	<string name="BytesSentReport">"Rapport du montant envoyé des données mobiles"</string>
+	<string name="HelloSignalReport">"Rapport Signal Bonjour"</string>
+	<string name="BatteryLevelReport">"Signaler niveau de la batterie"</string>
+	<string name="RoamingReport">"Signaler roaming"</string>
+	
+	
+</resources>
\ No newline at end of file
diff --git a/pandora_agents/android/res/values-it/strings.xml b/pandora_agents/android/res/values-it/strings.xml
new file mode 100644
index 0000000000..b3d9172c1f
--- /dev/null
+++ b/pandora_agents/android/res/values-it/strings.xml
@@ -0,0 +1,144 @@
+<!--
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation; version 2
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details. 
+--><resources>
+	<string name="const_string_preferences">"PANDROID_DATA"</string>
+
+	<string name="status_str">"Stato"</string>
+	<string name="setup_str">"Setup"</string>
+	<string name="app_name">"Agente Pandroid"</string>
+	<string name="interval">"Periodicità"</string>
+	<string name="update">"Aggiornare la configurazione."</string>
+	<string name="reset">"Imposta predefinito"</string>
+	<string name="serverAddr">"Indirizzo server:"</string>
+	<string name="serverPort">"Porta Server"</string>
+	<string name="confTitle">"Configurazione dell'agente Pandroid"</string>
+	<string name="agent">"Venditore:"</string>
+	<string name="gpsMode">"Modalità GPS"</string>
+	<string name="gpsCurrent">"Posizione attuale (costo batteria alto)"</string>
+	<string name="summary">"La configurazione attuale:"</string>
+	<string name="starStop">"Riavviare"</string>
+	<string name="gpsLast">"Ultima posizione nota"</string>
+	<string name="loading">"Caricamento..."</string>
+	<string name="last_values">"Ultimi valori"</string>
+	<string name="latitude">"Latitudine"</string>
+	<string name="longitude">"Longitudine"</string>
+	<string name="battery_level">"Livello batteria:"</string>
+	<string name="orientation">"Orientamento"</string>
+	<string name="proximity">"Prossimità"</string>
+	<string name="incorrect_update">"Impossibile aggiornare le opzioni."</string>
+	<string name="task">"Attività:"</string>
+	<string name="memory">"Memoria"</string>
+	<string name="help_label_str">"guida"</string>
+	<string name="about_label_str">"Circa"</string>
+	<string name="licensed_under_gpl_str">"Distribuito sotto licenza GPL v2"</string>
+	<string name="develop_team_str">"Sviluppatori: Sergio M. Zarzuelo, Miguel de Dios, Mark Holland"</string>
+	<string name="pandroid_agent_str">"Agente Pandroid"</string>
+	<string name="pandroid_agent_copyright">"Copyright © 2011 Artica"</string>
+	<string name="about_desc">"Agente logo Pandroid"</string>
+	<string name="help_str">"guida"</string>
+	<string formatted="false" name="memory_avaliable_str">"Disponibile: %iKb Total: %iKb"</string>
+	<string name="never_str">"Mai"</string>
+	<string name="now_str">"Ora."</string>
+	<string name="seconds_str">"secondi fa"</string>
+	<string name="conctact_error_str">"Contatto errore"</string>
+	<string name="last_contact_str">"Ultimo contatto:\n"</string>
+	<string name="help_text_str">"
+		Agente Pandroid è un Android Pandora FMS agente di Pandora FMS. &lt;p&gt; Pandora FMS è un generale sistema di monitoraggio scopo. Con l'agente di Android si possibile ottenere tutti i tipi di informazioni dal dispositivo, la posizione gps, quanta batteria rimane, la memoria disponibile sul dispositivo di monitoraggio, se un processo è attivo, il tempo in quanto il dispositivo è stato acceso, un segnale CIAO per il monitoraggio installazioni di app, un inventario con l'all Applicazioni installate cosí come informazioni per i telefoni Android con una sim card, l'ID scheda SIM, il numero di SMS inviati / ricevuti, il numero di chiamate in arrivo / perse / in uscita, la rete dall'operatore e dal tipo, il tipo di telefono, la potenza del segnale cellulare, il numero di byte inviati / ricevuti tramite la rete mobile. Codice sorgente completo è fornito. &lt;p&gt; Vedi di più su Pandora FMS all'indirizzo &lt;a href=\"http://pandorafms.com\"&gt; http://pandoraFMS.com &lt;/a&gt; &lt;/p&gt;
+	"</string>
+	<string name="start">"inizio"</string>
+	<string name="correct_start">"Collegamento riuscito!"</string>
+	<string name="config_saved">"Configurazione salvata con successo"</string>
+	<string name="contact_stopped_str">"Agente Arrestato"</string>
+	<string name="seconds">"secondi"</string>
+	<string name="running">"In esecuzione"</string>
+	<string name="stopped">"Arrestato"</string>
+	
+	
+	
+	<string name="sim_id">"Sim ID:"</string>
+	<string name="sim_id_value">""</string>
+	<string name="uptime">"Dispositivo Tempo:"</string>
+	<string name="uptime_value">""</string>
+	<string name="sms_received">"SMS ricevuti: "</string>
+	<string name="sms_received_value">""</string>
+	<string name="sms_sent">"SMS Inviati: "</string>
+	<string name="sms_sent_value">""</string>
+	<string name="network_operator">"Operatore di rete:"</string>
+	<string name="network_operator_value">""</string>
+	<string name="network_type">"Tipo di rete:"</string>
+	<string name="network_type_value">""</string>
+	<string name="phone_type">"Tipo di telefono:"</string>
+	<string name="phone_type_value">""</string>
+	<string name="signal_strength">"Intensità segnale:"</string>
+	<string name="signal_strength_value">""</string>
+	<string name="incoming_calls">"Chiamate entranti"</string>
+	<string name="incoming_calls_value">""</string>
+	<string name="missed_calls">"Chiamate senza risposta"</string>
+	<string name="missed_calls_value">""</string>
+	<string name="outgoing_calls">"Chiamate in uscita:"</string>
+	<string name="outgoing_calls_value">""</string>
+	<string name="receive_bytes">"Byte ricevuti:"</string>
+	<string name="receive_bytes_value">""</string>
+	<string name="transmit_bytes">"Byte trasmessi:"</string>
+	<string name="transmit_bytes_value">""</string>
+	<string name="roaming">"Roaming in corso:"</string>
+	<string name="roaming_value">""</string>
+	
+	
+	<string name="alert_dialog_password">"Inserisci password"</string>
+	<string name="password_no_match">"Le password non corrispondono"</string>
+	<string name="password_error">"errore"</string>
+	<string name="password">"Password"</string>
+	<string name="password_length">"password deve essere più lungo di 6 caratteri!"</string>
+	<string name="password_incorrect">"Password errata"</string>
+	<string name="password_set">"Imposta password (lasciare in bianco per nessuno)"</string>
+	<string name="password_enter">"Inserire il password:"</string>
+	<string name="password_repeat">"Conferma password:"</string>
+	<string name="password_choose_text">"Vuoi impostare una password?"</string>
+	<string name="password_checkbox">"Non chiedere più"</string>
+	<string name="password_created">"Password con successo creato"</string>
+	<string name="password_removed">"Nessuna password impostata"</string>
+	<string name="set_password">"Crea / Modifica password"</string>
+	
+	<string name="mobileWebURL">"URL del server Mobile:"</string>
+	<string name="go_to_web">"Visualizza sito Mobile"</string>
+	
+	<string name="enter">"Invio"</string>
+	<string name="back">"indietro"</string>
+	<string name="yes">"sì"</string>
+	<string name="no">"no"</string>
+	
+	<string name="simIDReport">"Report Sim ID"</string>
+	<string name="gpsReport">"Report dati GPS"</string>
+	<string name="memoryReport">"Report memoria disponibile"</string>
+	<string name="taskReport">"Relazione della task"</string>
+	<string name="uptimeReport">"Report dispositivo Tempo"</string>
+	<string name="NetworkOperatorReport">"Protocollo operativo di rete"</string>
+	<string name="NetworkTypeReport">"Tipo di rapporto di rete"</string>
+	<string name="PhoneTypeReport">"Report tipo di telefono"</string>
+	<string name="SignalStrengthReport">"Report potenza del segnale"</string>
+	<string name="ReceivedSMSReport">"Numero del rapporto della SMS ricevuti"</string>
+	<string name="SentSMSReport">"Numero del rapporto di SMS inviati"</string>
+	<string name="IncomingCallsReport">"Numero del rapporto delle chiamate in arrivo"</string>
+	<string name="MissedCallsReport">"Numero del rapporto di chiamate perse"</string>
+	<string name="OutgoingCallsReport">"Numero del rapporto delle chiamate in uscita"</string>
+	<string name="BytesReceivedReport">"Quantità Relazione ricevuti dati mobili"</string>
+	<string name="BytesSentReport">"Quantità Relazione inviati dati mobili"</string>
+	<string name="HelloSignalReport">"Report Ciao segnale"</string>
+	<string name="BatteryLevelReport">"Livello segnala batteria"</string>
+	<string name="RoamingReport">"Segnalare se il roaming"</string>
+	
+	
+</resources>
\ No newline at end of file
diff --git a/pandora_agents/android/res/values-ja/strings.xml b/pandora_agents/android/res/values-ja/strings.xml
index f32a7f23bd..4ddddc9859 100755
--- a/pandora_agents/android/res/values-ja/strings.xml
+++ b/pandora_agents/android/res/values-ja/strings.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
 // Pandora FMS - http://pandorafms.com
 // ==================================================
@@ -13,54 +12,131 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details. 
--->
-<resources>
-	<string name="const_string_preferences">PANDROID_DATA</string>
+--><resources>
+	<string name="const_string_preferences">"PANDROID_DATA"</string>
 
-	<string name="status_str">状態</string>
-	<string name="setup_str">設定</string>
-	<string name="app_name">Pandroid エージェント</string>
-	<string name="interval">間隔:</string>
-	<string name="update">設定の構成</string>
-	<string name="reset">デフォルト設定</string>
-	<string name="serverAddr">サーバアドレス:</string>
-	<string name="serverPort">サーバポート:</string>
-	<string name="confTitle">Pandroid エージェント設定</string>
-	<string name="agent">エージェント名:</string>
-	<string name="gpsReport">GPSデータレポート</string>
-	<string name="memoryReport">メモリシステムレポート</string>
-	<string name="taskReport">タスクレポート</string>
-	<string name="gpsMode">GPS モード</string>
-	<string name="gpsCurrent">現在の位置 (消費電力が大きいです)</string>
-	<string name="summary">現在の設定:</string>
-	<string name="starStop">再起動</string>
-	<string name="gpsLast">最新の位置</string>
-	<string name="loading">ロード中...</string>
-	<string name="process">プロセス</string>
-	<string name="last_values">最新の値</string>
-	<string name="latitude">緯度</string>
-	<string name="longitude">経度</string>
-	<string name="battery_level">バッテリー残量</string>
-	<string name="orientation">方位</string>
-	<string name="proximity">近傍</string>
-	<string name="incorrect_update">オプションの更新に失敗</string>
-	<string name="correct_update">オプションの更新に成功</string>
-	<string name="task">タスク</string>
-	<string name="memory">メモリ</string>
-	<string name="help_label_str">ヘルプ</string>
-	<string name="about_label_str">About</string>
-	<string name="licensed_under_gpl_str">GPL v2 ライセンス</string>
-	<string name="develop_team_str">開発者: Sergio M. Zarzuelo, Miguel de Dios</string>
-	<string name="pandroid_agent_str">Pandroid エージェント</string>
-	<string name="help_str">ヘルプ</string>
-	<string name="memory_avaliable_str" formatted="false">空き: &#37;iKb トータル: &#37;iKb</string>
-	<string name="never_str">なし</string>
-	<string name="now_str">今</string>
-	<string name="seconds_str">秒前</string>
-	<string name="conctact_error_str">接続エラー</string>
-	<string name="last_contact_str">最新の接続:\n</string>
-	<string name="help_text_str">
-		Pandroid エージェントは、Pandora FMS 用の Android エージェントです。&lt;p&gt;
-		Pandora FMS は統合監視システムです。Android エージェントでは、GPS の情報、バッテリーの残量、メモリ量を取得することができます。指定したプロセスが動作しているかを確認するように将来拡張することもでき、タブレットからサーバに組み込みデバイスの情報を送るのに便利です。デバイスに入っている他のアプリケーションやデータを取得するようにしたり、その他さまざまな処理を拡張することもできます。ソースコードを提供しています。&lt;p&gt;Pandora FMS に関する詳細は以下を参照ください。&lt;a href=&quot;http://pandorafms.org&quot;&gt;http://pandorafms.org&lt;/a&gt;&lt;/p&gt;
-	</string>
-</resources>
+	<string name="status_str">"ステータス"</string>
+	<string name="setup_str">"セットアップ"</string>
+	<string name="app_name">"Pandroid エージェント"</string>
+	<string name="interval">"間隔"</string>
+	<string name="update">"設定更新"</string>
+	<string name="reset">"デフォルトの設定"</string>
+	<string name="serverAddr">"サーバアドレス："</string>
+	<string name="serverPort">"サーバーポート:"</string>
+	<string name="confTitle">"Pandroid エージェントの設定"</string>
+	<string name="agent">"エージェント名："</string>
+	<string name="gpsMode">"GPSモード"</string>
+	<string name="gpsCurrent">"現在位置（高バッテリコスト）"</string>
+	<string name="summary">"現在の設定"</string>
+	<string name="starStop">"再起動"</string>
+	<string name="gpsLast">"最後の既知の位置"</string>
+	<string name="loading">"ロード中…"</string>
+	<string name="last_values">"最後の値"</string>
+	<string name="latitude">"緯度"</string>
+	<string name="longitude">"経度"</string>
+	<string name="battery_level">"バッテリーレベル"</string>
+	<string name="orientation">"方向決め"</string>
+	<string name="proximity">"近接"</string>
+	<string name="incorrect_update">"オプションを更新できませんでした。"</string>
+	<string name="task">"タスク"</string>
+	<string name="memory">"メモリー"</string>
+	<string name="help_label_str">"ヘルプ"</string>
+	<string name="about_label_str">"約"</string>
+	<string name="licensed_under_gpl_str">"GPL v2の下でライセンス"</string>
+	<string name="develop_team_str">"開発者：Sergio M. Zarzuelo, Miguel de Dios, Mark Holland"</string>
+	<string name="pandroid_agent_str">"Pandroid エージェント"</string>
+	<string name="pandroid_agent_copyright">"著作権 © 2011 Artica"</string>
+	<string name="about_desc">"Pandroid エージェントのロゴ"</string>
+	<string name="help_str">"ヘルプ"</string>
+	<string formatted="false" name="memory_avaliable_str">"利用可能な：%iKb 合計：%iKb"</string>
+	<string name="never_str">"絶対にない"</string>
+	<string name="now_str">"今すぐ。"</string>
+	<string name="seconds_str">"秒前"</string>
+	<string name="conctact_error_str">"エラーお問い合わせ"</string>
+	<string name="last_contact_str">"最後の接触ます\n"</string>
+	<string name="help_text_str">"PandroidエージェントがPandora FMSのためのAndroidアプリのPandora FMSエージェントです。 &lt;P&gt; Pandora FMSは、汎用監視システムです。 processがアクティブであるかどうかandroidのagent Withあなたは、あなたのdevice、GPSによる位置情報、device、監視上のバッテリーが残っているどのくらい、使用可能なメモリからデバイスがオンturnedされてから経過した時間、ハロー信号に情報のすべての種類を取得canアプリのインストール、SIMカードとAndroid携帯電話のための情報として、インストールされているすべてのアプリaswellでインベントリfor monitoring、SIMカードのIDを、SMSの数は、送信/受信、不在着信/発信/コールの数、ネットワークオペレータとタイプ、電話機タイプ、モバイル信号強度、モバイルネットワークを介して送信/受信されたバイト数。完全なソースコードが提供されます。&lt;p&gt;がhref=\"http://pandorafms.com\"&gt; http://pandoraFMS.comする&lt;/a&gt; &lt;/p&gt; &lt;aでPandora FMSの詳細を参照してください。"</string>
+	<string name="start">"開始"</string>
+	<string name="correct_start">"接続成功"</string>
+	<string name="config_saved">"設定の保存に成功しました"</string>
+	<string name="contact_stopped_str">"エージェントが停止"</string>
+	<string name="seconds">"秒"</string>
+	<string name="running">"実行中"</string>
+	<string name="stopped">"停止"</string>
+	
+	
+	
+	<string name="sim_id">"シムID："</string>
+	<string name="sim_id_value">""</string>
+	<string name="uptime">"タイムアップ装置："</string>
+	<string name="uptime_value">""</string>
+	<string name="sms_received">"受信したSMS："</string>
+	<string name="sms_received_value">""</string>
+	<string name="sms_sent">"送信されたSMS："</string>
+	<string name="sms_sent_value">""</string>
+	<string name="network_operator">"ネットワークオペレータ："</string>
+	<string name="network_operator_value">""</string>
+	<string name="network_type">"ネットワークの種類"</string>
+	<string name="network_type_value">""</string>
+	<string name="phone_type">"携帯電話の種類:"</string>
+	<string name="phone_type_value">""</string>
+	<string name="signal_strength">"信号の強さ："</string>
+	<string name="signal_strength_value">""</string>
+	<string name="incoming_calls">"着信コール"</string>
+	<string name="incoming_calls_value">""</string>
+	<string name="missed_calls">"不在着信："</string>
+	<string name="missed_calls_value">""</string>
+	<string name="outgoing_calls">"発信がある"</string>
+	<string name="outgoing_calls_value">""</string>
+	<string name="receive_bytes">"受信バイト数:"</string>
+	<string name="receive_bytes_value">""</string>
+	<string name="transmit_bytes">"バイトが送信された"</string>
+	<string name="transmit_bytes_value">""</string>
+	<string name="roaming">"ローミング："</string>
+	<string name="roaming_value">""</string>
+	
+	
+	<string name="alert_dialog_password">"パスワードを入力"</string>
+	<string name="password_no_match">"パスワードが一致しません"</string>
+	<string name="password_error">"エラー"</string>
+	<string name="password">"パスワード"</string>
+	<string name="password_length">"パスワードは6文字以上でなければなりません！"</string>
+	<string name="password_incorrect">"パスワードが間違っています。"</string>
+	<string name="password_set">"（なしの場合は空白のままにします）パスワードを設定"</string>
+	<string name="password_enter">"パスワードの入力"</string>
+	<string name="password_repeat">"パスワード再入力"</string>
+	<string name="password_choose_text">"は、パスワードを設定しますか？"</string>
+	<string name="password_checkbox">"再び尋ねるいけない"</string>
+	<string name="password_created">"パスワードが正常に作成"</string>
+	<string name="password_removed">"パスワードが設定されていません"</string>
+	<string name="set_password">"パスワードを作成/変更"</string>
+	
+	<string name="mobileWebURL">"モバイル·サーバーのURL："</string>
+	<string name="go_to_web">"携帯サイトを見る"</string>
+	
+	<string name="enter">"入力する"</string>
+	<string name="back">"バック"</string>
+	<string name="yes">"はい"</string>
+	<string name="no">"ノー"</string>
+	
+	<string name="simIDReport">"レポートシム番号"</string>
+	<string name="gpsReport">"レポートGPSデータ"</string>
+	<string name="memoryReport">"利用可能なメモリを通報"</string>
+	<string name="taskReport">"レポートタスク"</string>
+	<string name="uptimeReport">"タイムアップデバイスを報告"</string>
+	<string name="NetworkOperatorReport">"レポートのネットワークオペレータ"</string>
+	<string name="NetworkTypeReport">"レポート·ネットワークタイプ"</string>
+	<string name="PhoneTypeReport">"レポートの電話機タイプ"</string>
+	<string name="SignalStrengthReport">"信号強度を報告する"</string>
+	<string name="ReceivedSMSReport">"受信したSMSの数を報告"</string>
+	<string name="SentSMSReport">"送信されたSMSのレポート番号"</string>
+	<string name="IncomingCallsReport">"着信コールのレポート番号"</string>
+	<string name="MissedCallsReport">"不在着信の報告数"</string>
+	<string name="OutgoingCallsReport">"発信コールのレポート番号"</string>
+	<string name="BytesReceivedReport">"受信したモバイルデータの量を報告"</string>
+	<string name="BytesSentReport">"送信されたモバイル·データの量を報告"</string>
+	<string name="HelloSignalReport">"こんにちはシグナルを報告"</string>
+	<string name="BatteryLevelReport">"バッテリーレベルを報告"</string>
+	<string name="RoamingReport">"ローミングした場合、レポート"</string>
+	
+	
+</resources>
\ No newline at end of file
diff --git a/pandora_agents/android/res/values-pt/strings.xml b/pandora_agents/android/res/values-pt/strings.xml
new file mode 100644
index 0000000000..7f99b78091
--- /dev/null
+++ b/pandora_agents/android/res/values-pt/strings.xml
@@ -0,0 +1,144 @@
+<!--
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation; version 2
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details. 
+--><resources>
+	<string name="const_string_preferences">"PANDROID_DATA"</string>
+
+	<string name="status_str">"Estado"</string>
+	<string name="setup_str">"Configuração:"</string>
+	<string name="app_name">"Agente Pandroid"</string>
+	<string name="interval">"Intervalo"</string>
+	<string name="update">"Atualizar a configuração."</string>
+	<string name="reset">"Definir padrão"</string>
+	<string name="serverAddr">"Endereço do Servidor:"</string>
+	<string name="serverPort">"Porta do Servidor:"</string>
+	<string name="confTitle">"Configuração do agente Pandroid"</string>
+	<string name="agent">"Nome do agente:"</string>
+	<string name="gpsMode">"Modo de GPS"</string>
+	<string name="gpsCurrent">"Posição atual (custo de baterias de alta)"</string>
+	<string name="summary">"Configuração atual:"</string>
+	<string name="starStop">"Reiniciar"</string>
+	<string name="gpsLast">"Última posição conhecida"</string>
+	<string name="loading">"A carregar..."</string>
+	<string name="last_values">"Os últimos valores"</string>
+	<string name="latitude">"Latitude"</string>
+	<string name="longitude">"Longitude"</string>
+	<string name="battery_level">"Nível de Bateria"</string>
+	<string name="orientation">"Orientação"</string>
+	<string name="proximity">"Proximidade"</string>
+	<string name="incorrect_update">"Não foi possível atualizar opções."</string>
+	<string name="task">"Funções:"</string>
+	<string name="memory">"Memória"</string>
+	<string name="help_label_str">"Help (Ajuda)"</string>
+	<string name="about_label_str">"Acerca de"</string>
+	<string name="licensed_under_gpl_str">"Licenciado sob a GPL v2"</string>
+	<string name="develop_team_str">"Desenvolvedores: Sergio M. Zarzuelo, Miguel de Dios, Marcos Holanda"</string>
+	<string name="pandroid_agent_str">"Agente Pandroid"</string>
+	<string name="pandroid_agent_copyright">"Copyright © 2011 Artica"</string>
+	<string name="about_desc">"Logotipo Agente Pandroid"</string>
+	<string name="help_str">"Help (Ajuda)"</string>
+	<string formatted="false" name="memory_avaliable_str">"Avaliable: %iKb Total: %iKb"</string>
+	<string name="never_str">"Nunca."</string>
+	<string name="now_str">"Ja! "</string>
+	<string name="seconds_str">"segundo atrás."</string>
+	<string name="conctact_error_str">"Fale erro"</string>
+	<string name="last_contact_str">"Último Contato:\n"</string>
+	<string name="help_text_str">"
+		Agente Pandroid é um Android Pandora agente de Pandora. &lt;p&gt; Pandora FMS é um sistema de monitoramento de propósito geral. Com o agente Android você pode obter todos os tipos de informações do seu dispositivo, a localização GPS, o quanto de bateria é deixado de memória, disponível no dispositivo de monitorização, se um processo está ativo, o tempo desde que o dispositivo foi ligado, um sinal OLÁ para monitorar as instalações do app, um inventário com todos os aplicativos instalados aswell como informação para telefones Android com um cartão SIM, a identificação do cartão SIM, o número de SMS enviadas / recebidas, o número de chamadas recebidas / perdidas / saída, a rede operador e do tipo, o tipo de telefone, a intensidade do sinal celular, o número de bytes enviados / recebidos através da rede móvel. Código-fonte completo é fornecido. &lt;p&gt; Veja mais sobre Pandora em &lt;a href=\"http://pandorafms.com\"&gt; http://pandoraFMS.com &lt;/a&gt; &lt;/p&gt;
+	"</string>
+	<string name="start">"Início"</string>
+	<string name="correct_start">"Conexão bem-sucedida"</string>
+	<string name="config_saved">"Configuração salva com sucesso"</string>
+	<string name="contact_stopped_str">"Agente Parado"</string>
+	<string name="seconds">"Segundos"</string>
+	<string name="running">"Executar"</string>
+	<string name="stopped">"Parado"</string>
+	
+	
+	
+	<string name="sim_id">"Sim ID:"</string>
+	<string name="sim_id_value">""</string>
+	<string name="uptime">"Dispositivo o tempo:"</string>
+	<string name="uptime_value">""</string>
+	<string name="sms_received">"SMS recebidos: "</string>
+	<string name="sms_received_value">""</string>
+	<string name="sms_sent">"SMS enviado: "</string>
+	<string name="sms_sent_value">""</string>
+	<string name="network_operator">"Operador de rede:"</string>
+	<string name="network_operator_value">""</string>
+	<string name="network_type">"Tipo de rede:"</string>
+	<string name="network_type_value">""</string>
+	<string name="phone_type">"Tipo de telefone:"</string>
+	<string name="phone_type_value">""</string>
+	<string name="signal_strength">"Intensidade do sinal"</string>
+	<string name="signal_strength_value">""</string>
+	<string name="incoming_calls">"As chamadas recebidas:"</string>
+	<string name="incoming_calls_value">""</string>
+	<string name="missed_calls">"Chamadas perdidas:"</string>
+	<string name="missed_calls_value">""</string>
+	<string name="outgoing_calls">"Chamadas de saída:"</string>
+	<string name="outgoing_calls_value">""</string>
+	<string name="receive_bytes">"Bytes recebidos:"</string>
+	<string name="receive_bytes_value">""</string>
+	<string name="transmit_bytes">"Bytes transmitidos:"</string>
+	<string name="transmit_bytes_value">""</string>
+	<string name="roaming">"Roaming:"</string>
+	<string name="roaming_value">""</string>
+	
+	
+	<string name="alert_dialog_password">"Digite a passe"</string>
+	<string name="password_no_match">"As senhas não combinam!"</string>
+	<string name="password_error">"error"</string>
+	<string name="password">"Palavra-passe: "</string>
+	<string name="password_length">"senha deve ter mais de 6 caracteres!"</string>
+	<string name="password_incorrect">"Passe errada"</string>
+	<string name="password_set">"Definir senha (deixe em branco para nenhum)"</string>
+	<string name="password_enter">"Digite a passe"</string>
+	<string name="password_repeat">"Repita Senha"</string>
+	<string name="password_choose_text">"Você quer definir uma senha?"</string>
+	<string name="password_checkbox">"Não pergunte novamente"</string>
+	<string name="password_created">"Senha com sucesso criado"</string>
+	<string name="password_removed">"Nenhum conjunto senha"</string>
+	<string name="set_password">"Criar / Alterar senha"</string>
+	
+	<string name="mobileWebURL">"URL do servidor móvel:"</string>
+	<string name="go_to_web">"Veja o site móvel"</string>
+	
+	<string name="enter">"Enter"</string>
+	<string name="back">"voltar"</string>
+	<string name="yes">"SIM"</string>
+	<string name="no">"não"</string>
+	
+	<string name="simIDReport">"Relatório Sim ID"</string>
+	<string name="gpsReport">"Relatório de dados GPS"</string>
+	<string name="memoryReport">"Relatório memória disponível"</string>
+	<string name="taskReport">"Tarefa de relatório"</string>
+	<string name="uptimeReport">"Relatório dispositivo o tempo"</string>
+	<string name="NetworkOperatorReport">"Relatório operador de rede"</string>
+	<string name="NetworkTypeReport">"Tipo de rede relatório"</string>
+	<string name="PhoneTypeReport">"Tipo de telefone relatório"</string>
+	<string name="SignalStrengthReport">"Relatam a intensidade do sinal"</string>
+	<string name="ReceivedSMSReport">"Número do relatório de SMS recebidas"</string>
+	<string name="SentSMSReport">"Número do relatório de SMS enviados"</string>
+	<string name="IncomingCallsReport">"Número do relatório de chamadas recebidas"</string>
+	<string name="MissedCallsReport">"Número do relatório de chamadas não atendidas"</string>
+	<string name="OutgoingCallsReport">"Número do relatório de chamadas de saída"</string>
+	<string name="BytesReceivedReport">"Relatório do montante recebido dados móveis"</string>
+	<string name="BytesSentReport">"Relatório do montante enviado dados móveis"</string>
+	<string name="HelloSignalReport">"Relatório Olá sinal"</string>
+	<string name="BatteryLevelReport">"Relatório de nível da bateria"</string>
+	<string name="RoamingReport">"Relatar se de roaming"</string>
+	
+	
+</resources>
\ No newline at end of file
diff --git a/pandora_agents/android/res/values-zh/strings.xml b/pandora_agents/android/res/values-zh/strings.xml
new file mode 100644
index 0000000000..f8af5e6873
--- /dev/null
+++ b/pandora_agents/android/res/values-zh/strings.xml
@@ -0,0 +1,143 @@
+<!--
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation; version 2
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details. 
+--><resources>
+	<string name="const_string_preferences">"PANDROID_DATA"</string>
+
+	<string name="status_str">"*状态*"</string>
+	<string name="setup_str">"设置"</string>
+	<string name="app_name">"Pandroid代理"</string>
+	<string name="interval">"周期"</string>
+	<string name="update">"更新配置。"</string>
+	<string name="reset">"设置默认值"</string>
+	<string name="serverAddr">"服务器地址："</string>
+	<string name="serverPort">"服务器端口："</string>
+	<string name="confTitle">"Pandroid代理配置"</string>
+	<string name="agent">"机构名称："</string>
+	<string name="gpsMode">"GPS模式"</string>
+	<string name="gpsCurrent">"当前位置（电池成本高）"</string>
+	<string name="summary">"配置："</string>
+	<string name="starStop">"重新启动(Restart)"</string>
+	<string name="gpsLast">"最后已知的位置"</string>
+	<string name="loading">"载入中..."</string>
+	<string name="last_values">"最后一个值"</string>
+	<string name="latitude">"纬度"</string>
+	<string name="longitude">"经度"</string>
+	<string name="battery_level">"电池电量："</string>
+	<string name="orientation">"位置和方向"</string>
+	<string name="proximity">"n.接近,接近度"</string>
+	<string name="incorrect_update">"无法更新选项。"</string>
+	<string name="task">"人物"</string>
+	<string name="memory">"内存"</string>
+	<string name="help_label_str">"愿意帮助"</string>
+	<string name="about_label_str">"关于"</string>
+	<string name="licensed_under_gpl_str">"根据GPL v2的许可"</string>
+	<string name="develop_team_str">"开发商：Sergio M. Zarzuelo, Miguel de Dios, Mark Holland"</string>
+	<string name="pandroid_agent_str">"Pandroid代理"</string>
+	<string name="pandroid_agent_copyright">"版权所有 © 2011 Artica"</string>
+	<string name="about_desc">"Pandroid代理标志"</string>
+	<string name="help_str">"愿意帮助"</string>
+	<string formatted="false" name="memory_avaliable_str">"可供选择：%iKb 总计：%iKb"</string>
+	<string name="never_str">"从来没有。"</string>
+	<string name="now_str">"现在，。"</string>
+	<string name="seconds_str">"秒前。"</string>
+	<string name="conctact_error_str">"联系错误"</string>
+	<string name="last_contact_str">"最后联系方式\n"</string>
+	<string name="help_text_str">"Pandroid代理是一个Android潘多拉潘多拉柔性制造系统FMS代理。 &lt;P&gt;潘多拉FMS是一个通用的监控系统。随着Android代理，你可以得到各种信息设备，GPS定位，电池留多少，可用内存设备，监控，如果一个进程处于活动状态的时间，因为该装置被打开，一个HELLO信号监测装置的应用程序，清点所有已安装的应用程序以及Android手机的SIM卡的SIM卡ID的信息，发送/接收的短信数量，呼叫来电/未接/输出，网络运营商和类型，手机类型，在手机信号强度，通过移动网络发送/接收的字节数。提供完整的源代码。&lt;p&gt;查看更多关于潘多拉FMS &lt;a href=\"http://pandorafms.com\"&gt; http://pandoraFMS.com &lt;/a&gt; &lt;/p&gt;"</string>
+	<string name="start">"开始"</string>
+	<string name="correct_start">"连接成功"</string>
+	<string name="config_saved">"配置保存成功"</string>
+	<string name="contact_stopped_str">"代理停止"</string>
+	<string name="seconds">"秒"</string>
+	<string name="running">"运行"</string>
+	<string name="stopped">"已停止"</string>
+	
+	
+	
+	<string name="sim_id">"辛ID："</string>
+	<string name="sim_id_value">""</string>
+	<string name="uptime">"设备时间："</string>
+	<string name="uptime_value">""</string>
+	<string name="sms_received">"收到短信："</string>
+	<string name="sms_received_value">""</string>
+	<string name="sms_sent">"发送短信："</string>
+	<string name="sms_sent_value">""</string>
+	<string name="network_operator">"网络运营商："</string>
+	<string name="network_operator_value">""</string>
+	<string name="network_type">"网络类型："</string>
+	<string name="network_type_value">""</string>
+	<string name="phone_type">"手机类型："</string>
+	<string name="phone_type_value">""</string>
+	<string name="signal_strength">"信号强度："</string>
+	<string name="signal_strength_value">""</string>
+	<string name="incoming_calls">"来电："</string>
+	<string name="incoming_calls_value">""</string>
+	<string name="missed_calls">"未接来电："</string>
+	<string name="missed_calls_value">""</string>
+	<string name="outgoing_calls">"拨出电话："</string>
+	<string name="outgoing_calls_value">""</string>
+	<string name="receive_bytes">"接收的字节数："</string>
+	<string name="receive_bytes_value">""</string>
+	<string name="transmit_bytes">"传输字节数："</string>
+	<string name="transmit_bytes_value">""</string>
+	<string name="roaming">"漫游："</string>
+	<string name="roaming_value">""</string>
+	
+	
+	<string name="alert_dialog_password">"“输入密码”；
+"</string>
+	<string name="password_no_match">"“密码不相符”；"</string>
+	<string name="password_error">"錯誤"</string>
+	<string name="password">"密码"</string>
+	<string name="password_length">"密码长度必须大于6个字符！"</string>
+	<string name="password_incorrect">"密码错误"</string>
+	<string name="password_set">"设置密码（留空为空）"</string>
+	<string name="password_enter">"输入密码"</string>
+	<string name="password_repeat">"密码重复"</string>
+	<string name="password_choose_text">"你要设置的密码？"</string>
+	<string name="password_checkbox">"不要再问"</string>
+	<string name="password_created">"成功地创建密码"</string>
+	<string name="password_removed">"没有设置密码"</string>
+	<string name="set_password">"创建/更改密码"</string>
+	
+	<string name="mobileWebURL">"Mobile服务器的URL："</string>
+	<string name="go_to_web">"查看手机网站"</string>
+	
+	<string name="enter">"进入"</string>
+	<string name="back">"背面"</string>
+	<string name="yes">"是"</string>
+	<string name="no">"没有"</string>
+	
+	<string name="simIDReport">"报告SIM卡ID"</string>
+	<string name="gpsReport">"报告GPS数据"</string>
+	<string name="memoryReport">"报告可用内存"</string>
+	<string name="taskReport">"报告任务"</string>
+	<string name="uptimeReport">"报告设备的正常运行时间"</string>
+	<string name="NetworkOperatorReport">"报告网络运营商"</string>
+	<string name="NetworkTypeReport">"报告网络类型"</string>
+	<string name="PhoneTypeReport">"举报电话类型"</string>
+	<string name="SignalStrengthReport">"报告的信号强度"</string>
+	<string name="ReceivedSMSReport">"报告数收到的短信"</string>
+	<string name="SentSMSReport">"报告编号发送短信"</string>
+	<string name="IncomingCallsReport">"报告的来电"</string>
+	<string name="MissedCallsReport">"报告的未接来电"</string>
+	<string name="OutgoingCallsReport">"报告编号拨出电话"</string>
+	<string name="BytesReceivedReport">"收到的移动台的数据的量是"</string>
+	<string name="BytesSentReport">"报告发送的移动数据量"</string>
+	<string name="HelloSignalReport">"报告hello信号"</string>
+	<string name="BatteryLevelReport">"报告电池电量"</string>
+	<string name="RoamingReport">"报告如果漫游"</string>
+	
+	
+</resources>
\ No newline at end of file
diff --git a/pandora_agents/android/res/values/strings.xml b/pandora_agents/android/res/values/strings.xml
index 5a584f340f..faf6f02857 100755
--- a/pandora_agents/android/res/values/strings.xml
+++ b/pandora_agents/android/res/values/strings.xml
@@ -27,32 +27,27 @@
 	<string name="serverPort">Server Port:</string>
 	<string name="confTitle">Pandroid Agent Configuration</string>
 	<string name="agent">Agent name:</string>
-	<string name="gpsReport">Report GPS data</string>
-	<string name="memoryReport">Report available memory</string>
-	<string name="taskReport">Report task</string>
 	<string name="gpsMode">GPS Mode</string>
 	<string name="gpsCurrent">Current position (high battery cost)</string>
 	<string name="summary">Current configuration:</string>
 	<string name="starStop">Restart</string>
 	<string name="gpsLast">Last known position</string>
-	<string name="loading">Loading...</string>
-	<string name="process">Process</string>
+	<string name="loading">Loading…</string>
 	<string name="last_values">Last values</string>
 	<string name="latitude">Latitude</string>
 	<string name="longitude">Longitude</string>
 	<string name="battery_level">Battery Level</string>
 	<string name="orientation">Orientation</string>
 	<string name="proximity">Proximity</string>
-	<string name="incorrect_update">Unsucessful update options.</string>
-	<string name="correct_update">sucessfully updated configuration.</string>
+	<string name="incorrect_update">Could not update options.</string>
 	<string name="task">Task</string>
 	<string name="memory">Memory</string>
 	<string name="help_label_str">Help</string>
 	<string name="about_label_str">About</string>
 	<string name="licensed_under_gpl_str">Licensed under GPL v2</string>
-	<string name="develop_team_str">Developer: Sergio M. Zarzuelo, Miguel de Dios</string>
+	<string name="develop_team_str">Developers: Sergio M. Zarzuelo, Miguel de Dios, Mark Holland</string>
 	<string name="pandroid_agent_str">Pandroid Agent</string>
-	<string name="pandroid_agent_copyright">Copyright (c) 2011 Artica</string>
+	<string name="pandroid_agent_copyright">Copyright © 2011 Artica</string>
 	<string name="about_desc">Pandroid Agent logo</string>
 	<string name="help_str">Help</string>
 	<string name="memory_avaliable_str" formatted="false">Avaliable: &#37;iKb Total: &#37;iKb</string>
@@ -64,18 +59,24 @@
 	<string name="help_text_str">
 		Pandroid Agent is an Android Pandora FMS agent for Pandora FMS. &lt;p&gt;
 		Pandora FMS is a general purpose monitoring system. With the android agent you can get all sorts of information from your device,
-		 the gps location, how much battery is left, available memory on the device, monitoring if a process is acvtive, the time since the device was turned on, a HELLO signal for monitoring installations of the app
-		  aswell as information for android phones with a sim card; the sim card ID, the number of SMS sent/received, the number of calls
-		   incoming/missed/outgoing, the network operator and type, the phone type, the mobile signal strength, the number of bytes sent/received 
-		   over the mobile network. Complete source code is provided.&lt;p&gt;See more about Pandora FMS at &lt;a href=&quot;http://pandorafms.org&quot;&gt;http://pandorafms.org&lt;/a&gt;&lt;/p&gt;
+		 the gps location, how much battery is left, available memory on the device, monitoring if a process is active, the time since the device
+		  was turned on, a HELLO signal for monitoring installations of the app, an inventory with all the installed apps aswell as information 
+		  for android phones with a sim card; the sim card ID, the number of SMS sent/received, the number of calls incoming/missed/outgoing, 
+		  the network operator and type, the phone type, the mobile signal strength, the number of bytes sent/received over the mobile network.
+		  Complete source code is provided.&lt;p&gt;See more about Pandora FMS at &lt;a href=&quot;http://pandorafms.com&quot;&gt;http://pandoraFMS.com&lt;/a&gt;&lt;/p&gt;
 	</string>
 	<string name="start">Start</string>
 	<string name="correct_start">Connection successful</string>
 	<string name="config_saved">Configuration saved successfully</string>
 	<string name="contact_stopped_str">Agent Stopped</string>
+	<string name="seconds">Seconds</string>
+	<string name="running">Running</string>
+	<string name="stopped">Stopped</string>
+	
+	
+	
 	<string name="sim_id">Sim ID:</string>
 	<string name="sim_id_value"/>
-	<string name="loading_str">Loading...</string>
 	<string name="uptime">Device up time:</string>
 	<string name="uptime_value"/>
 	<string name="sms_received">Received SMS: </string>
@@ -84,7 +85,6 @@
 	<string name="sms_sent_value"/>
 	<string name="network_operator">Network operator:</string>
 	<string name="network_operator_value"/>
-	<string name="simIDReport">Report Sim ID</string>
 	<string name="network_type">Network type:</string>
 	<string name="network_type_value"/>
 	<string name="phone_type">Phone type:</string>
@@ -101,6 +101,10 @@
 	<string name="receive_bytes_value"/>
 	<string name="transmit_bytes">Bytes transmitted:</string>
 	<string name="transmit_bytes_value"/>
+	<string name="roaming">Roaming:</string>
+	<string name="roaming_value"/>
+	
+	
 	<string name="alert_dialog_password">Enter password</string>
 	<string name="password_no_match">Passwords do not match!</string>
 	<string name="password_error">error</string>
@@ -111,19 +115,23 @@
 	<string name="password_enter">Enter Password</string>
 	<string name="password_repeat">Repeat Password</string>
 	<string name="password_choose_text">Do you want to set a password?</string>
-	<string name="password_checkbox">Dont ask again</string>
+	<string name="password_checkbox">Don\'t ask again</string>
 	<string name="password_created">Password sucessfully created</string>
 	<string name="password_removed">No password set</string>
 	<string name="set_password">Create/Change password</string>
+	
+	<string name="mobileWebURL">Mobile server URL:</string>
+	<string name="go_to_web">View Mobile site</string>
+	
 	<string name="enter">enter</string>
 	<string name="back">back</string>
 	<string name="yes">yes</string>
 	<string name="no">no</string>
-	<string name="roaming_value"/>
-	<string name="roaming">Roaming:</string>
-	<string name="webname">Mobile server url:</string>
-	<string name="go_to_web">View Mobile site</string>
 	
+	<string name="simIDReport">Report Sim ID</string>
+	<string name="gpsReport">Report GPS data</string>
+	<string name="memoryReport">Report available memory</string>
+	<string name="taskReport">Report task</string>
 	<string name="uptimeReport">Report device up time</string>
 	<string name="NetworkOperatorReport">Report network operator</string>
 	<string name="NetworkTypeReport">Report network type</string>
diff --git a/pandora_agents/android/src/pandroid/agent/About.java b/pandora_agents/android/src/pandroid/agent/About.java
index 698928657e..e765243e4c 100644
--- a/pandora_agents/android/src/pandroid/agent/About.java
+++ b/pandora_agents/android/src/pandroid/agent/About.java
@@ -28,7 +28,7 @@ public class About extends Activity {
         setContentView(R.layout.about);
         
         TextView text = (TextView) findViewById(R.id.url_pandora);
-        text.setText(Html.fromHtml("<a href='http://pandorafms.org/'>PandoraFMS.org</a>"));
+        text.setText(Html.fromHtml("<a href='http://pandorafms.com/'>PandoraFMS.com</a>"));
         text.setMovementMethod(LinkMovementMethod.getInstance());
 	}
 }
diff --git a/pandora_agents/android/src/pandroid/agent/Core.java b/pandora_agents/android/src/pandroid/agent/Core.java
index ba415ef147..166b3c4deb 100644
--- a/pandora_agents/android/src/pandroid/agent/Core.java
+++ b/pandora_agents/android/src/pandroid/agent/Core.java
@@ -46,7 +46,7 @@ public class Core {
     static volatile public String defaultServerPort = "41121";
     static volatile public int defaultInterval = 300;
     static volatile public String defaultAgentName = "pandroid";
-    static volatile public String defaultWebName = "firefly.artica.es/pandora_console/mobile";
+    static volatile public String defaultmobileWebURL = "firefly.artica.es/pandora_demo/mobile";
     static volatile public String defaultGpsStatus = "enabled"; // "disabled" or "enabled"
     static volatile public String defaultBatteryLevelReport = "enabled"; // "disabled" or "enabled"
     static volatile public String defaultMemoryStatus = "enabled"; // "disabled" or "enabled"
@@ -96,10 +96,9 @@ public class Core {
     static volatile public int defaultHelloSignal = 2;
     static volatile public int defaultRoaming = 0;
     
-    //Temporary
+    
     static volatile public String defaultPassword = "";
-    
-    
+       
     static volatile public Context con = null;
     static volatile public AlarmManager am = null;
     static volatile public PendingIntent sender = null;
@@ -112,8 +111,8 @@ public class Core {
     static volatile public String serverAddr = defaultServerAddr;
     static volatile public String serverPort  = defaultServerPort;
     static volatile public int interval = defaultInterval;
-    static volatile public String agentName = defaultWebName;
-    static volatile public String webName = defaultAgentName;
+    static volatile public String agentName = defaultmobileWebURL;
+    static volatile public String mobileWebURL = defaultAgentName;
     static volatile public String gpsStatus = defaultGpsStatus;
     static volatile public String memoryStatus = defaultMemoryStatus;
     static volatile public String taskStatus = defaultTaskStatus;
@@ -139,7 +138,6 @@ public class Core {
     
     static volatile public boolean hasSim = defaultHasSim;
     
-    //temporary
     static volatile public String password = defaultPassword;
     
     //																//
@@ -172,10 +170,7 @@ public class Core {
     
     static volatile public long lastContact = CONST_INVALID_CONTACT;
     static volatile public int contactError = CONST_CONTACT_ERROR;
-    
-    //log
-    public static final String LOG_TAG = "mark";
-    
+        
     public Core() {
     	
     }
@@ -194,8 +189,6 @@ public class Core {
     	alarmEnabled = true;
     	am.setRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(), (interval * 1000), sender);
     	
-    	
-    
     }// end startAgentListener
     
     static public void stopAgentListener() {
@@ -210,9 +203,7 @@ public class Core {
 		startAgentListener(context);
 	}
 	
-	
-    
-    static public void loadLastValues(Context context) {
+	static public void loadLastValues(Context context) {
     	if (con == null) {
     		con = context;
     	}
@@ -236,7 +227,6 @@ public class Core {
 		lastContact = agentPreferences.getLong("lastContact", defaultContact);
 		contactError = agentPreferences.getInt("contactError", defaultContactError);
 		simID = agentPreferences.getString("simID", defaultSimID);
-		
 		upTime = agentPreferences.getLong("upTime", Core.defaultUpTime);
 		SMSReceived = agentPreferences.getInt("SMSReceived", defaultSMSReceived);
 		SMSSent = agentPreferences.getInt("SMSSent", defaultSMSSent);
@@ -266,9 +256,8 @@ public class Core {
 		serverAddr = agentPreferences.getString("serverAddr", defaultServerAddr);
 		serverPort = agentPreferences.getString("serverPort", defaultServerPort);
 		interval = agentPreferences.getInt("interval", defaultInterval);
-		//fix agent name to mark
 		agentName = agentPreferences.getString("agentName", defaultAgentName+"_"+Installation.id(context));
-		webName = agentPreferences.getString("webName", defaultWebName);
+		mobileWebURL = agentPreferences.getString("mobileWebURL", defaultmobileWebURL);
 		gpsStatus = agentPreferences.getString("gpsStatus", defaultGpsStatus);
 		memoryStatus = agentPreferences.getString("memoryStatus", defaultMemoryStatus);
 		taskStatus = agentPreferences.getString("taskStatus", defaultTaskStatus);
@@ -304,9 +293,10 @@ public class Core {
     		passwordCheck, DeviceUpTimeReport, NetworkOperatorReport, NetworkTypeReport, PhoneTypeReport,
     		SignalStrengthReport, ReceivedSMSReport, SentSMSReport, IncomingCallsReport, MissedCallsReport,
     		OutgoingCallsReport, BytesReceivedReport, BytesSentReport, HelloSignalReport, BatteryLevelReport,
-    		RoamingReport, roaming, webName
+    		RoamingReport, roaming, mobileWebURL
     		);
-    }
+    	
+    }// end updateConf
     
     static public boolean updateConf(Context context, String _serverAddr,
     	String _serverPort, int _interval, String _agentName, String _gpsStatus,
@@ -317,7 +307,7 @@ public class Core {
     	String _password, int _helloSignal, String _passwordCheck, String _DeviceUpTimeReport, String _NetworkOperatorReport,
     	String _NetworkTypeReport, String _PhoneTypeReport, String _SignalStrengthReport, String _ReceivedSMSReport,
     	String _SentSMSReport, String _IncomingCallsReport, String _MissedCallsReport, String _OutgoingCallsReport, String _BytesReceivedReport,
-    	String _BytesSentReport, String _HelloSignalReport, String _BatteryLevelReport, String _RoamingReport, int _roaming, String _webName) {
+    	String _BytesSentReport, String _HelloSignalReport, String _BatteryLevelReport, String _RoamingReport, int _roaming, String _mobileWebURL) {
     	
     	if (con == null) {
     		con = context;
@@ -370,7 +360,7 @@ public class Core {
 		editor.putString("HelloSignalReport", _HelloSignalReport); 
 		editor.putString("BatteryLevelReport", _BatteryLevelReport);
 		editor.putString("RoamingReport", _RoamingReport);
-		editor.putString("webName", _webName);
+		editor.putString("mobileWebURL", _mobileWebURL);
 		
 		if (editor.commit()) {
 			return true;
diff --git a/pandora_agents/android/src/pandroid/agent/Installation.java b/pandora_agents/android/src/pandroid/agent/Installation.java
index cb12c3c799..e98dee8338 100644
--- a/pandora_agents/android/src/pandroid/agent/Installation.java
+++ b/pandora_agents/android/src/pandroid/agent/Installation.java
@@ -21,6 +21,12 @@ import java.util.UUID;
 
 import android.content.Context;
 
+/**
+ * This is a class for providing unique installation identifiers for use with the pandroid agent name
+ * @author mark
+ *
+ */
+
 public class Installation {
     private static String sID = null;
     private static final String INSTALLATION = "INSTALLATION";
diff --git a/pandora_agents/android/src/pandroid/agent/PandroidAgent.java b/pandora_agents/android/src/pandroid/agent/PandroidAgent.java
index fa2c738abe..80beeeabfe 100755
--- a/pandora_agents/android/src/pandroid/agent/PandroidAgent.java
+++ b/pandora_agents/android/src/pandroid/agent/PandroidAgent.java
@@ -14,68 +14,47 @@
 
 package pandroid.agent;
 
-//import java.util.Date;
-
-//import android.app.Activity;
-//import android.app.AlarmManager;
-//import android.app.PendingIntent;
+import android.app.Dialog;
 import android.app.TabActivity;
-//import android.content.ComponentName;
-//import android.content.Context;
 import android.content.Context;
 import android.content.Intent;
-//import android.content.SharedPreferences;
-//import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
-//import android.telephony.TelephonyManager;
-//import android.view.KeyEvent;
-//import android.view.View;
-//import android.view.View.OnClickListener;
-//import android.view.View.OnKeyListener;
-//import android.view.inputmethod.InputMethodManager;
-//import android.widget.Button;
-//import android.widget.CheckBox;
-//import android.widget.EditText;
 import android.telephony.TelephonyManager;
+import android.view.WindowManager.LayoutParams;
 import android.widget.TabHost;
-//import android.widget.TextView;
-import android.util.Log;
 
 public class PandroidAgent extends TabActivity {
 	
-	public static final String LOG_TAG = "mark";
-//public class PandroidAgent extends Activity {
-    Handler h = new Handler();
-    
-    int defaultInterval = 300; //important
-    /*
-    String defaultServerPort = "41121";
-    String defaultServerAddr = "farscape.artica.es";
-    String defaultAgentName = "pandroid";
-    String defaultGpsStatus = "disabled"; // "disabled" or "enabled"
-    */
-    //boolean alarmEnabled;
-    
-    //boolean showLastXML = true;
-    
-    //String lastGpsContactDateTime = "";
-    
-    //Thread thread = new Thread();
-    //ComponentName service = null;
-    //PendingIntent sender = null;
-    //AlarmManager am = null;
-    
+	Handler h = new Handler();
+    int defaultInterval = 300;
     TabHost tabHost;
+    
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        //if removed, battery -1 and agent reverts to defaults in core
-        Core.restartAgentListener(getApplicationContext());
+       
+        final Dialog dialog = new Dialog(this,android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+		dialog.setContentView(R.layout.welcome);
+		dialog.setCancelable(false);
+		dialog.getWindow().setFlags(LayoutParams.FLAG_FULLSCREEN, LayoutParams.FLAG_FULLSCREEN);
+        
+        
+        dialog.show();
+         
+        final Handler handler = new Handler();
+        handler.postDelayed(new Runnable() {
+          @Override
+          public void run() {
+        	  dialog.dismiss(); 
+          }
+        }, 3000);   	
+            	
+         Core.restartAgentListener(getApplicationContext());
+            
         
         //Check whether device has a sim card, phone without a sim card present
         //return SIM_STATE_ABSENT but tablets only return SIM_STATE_UNKNOWN
-        
         String serviceName = Context.TELEPHONY_SERVICE;
 		TelephonyManager telephonyManager = (TelephonyManager) getApplicationContext().getSystemService(serviceName);
 		String hasSim = ""+(telephonyManager.getSimState() != TelephonyManager.SIM_STATE_UNKNOWN);
@@ -83,9 +62,11 @@ public class PandroidAgent extends TabActivity {
 			hasSim = ""+(telephonyManager.getSimState() != TelephonyManager.SIM_STATE_ABSENT);
 		Core.hasSim = Boolean.parseBoolean(hasSim);
 		
+	
+            
 		
 		
-        //Create layout with 2 tabs
+		//Create layout with 2 tabs
 		tabHost  = getTabHost();
         
         tabHost.addTab
@@ -101,16 +82,12 @@ public class PandroidAgent extends TabActivity {
 			.setIndicator(getString(R.string.setup_str))
 			.setContent(new Intent(this, Setup.class))
 		);
-        
-        //tabHost.getTabWidget().getChildAt(0).getLayoutParams();
-		//tabHost.getTabWidget().getChildAt(1).getLayoutParams();
-        
     }
     
     //Sets hello signal to 1(first connect since pandroid was closed)
     public void onResume(){
     	super.onResume();
-    	Log.v(LOG_TAG, "hello signal: "+Core.helloSignal);
+    	
     	if(Core.helloSignal == 0)
     		Core.helloSignal = 1;
     	Core.updateConf(getApplicationContext());
diff --git a/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java b/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
index 420e8963fc..5be6113d92 100644
--- a/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
+++ b/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
@@ -30,11 +30,11 @@ import android.app.ActivityManager;
 import android.app.ActivityManager.MemoryInfo;
 import android.app.ActivityManager.RunningAppProcessInfo;
 import android.app.Service;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.location.Criteria;
@@ -43,6 +43,7 @@ import android.location.LocationListener;
 import android.location.LocationManager;
 import android.net.TrafficStats;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -54,22 +55,18 @@ import android.telephony.PhoneStateListener;
 import android.telephony.SignalStrength;
 import android.telephony.TelephonyManager;
 import android.util.Log;
+import android.view.Gravity;
+import android.widget.Toast;
 
 public class PandroidAgentListener extends Service {
 	
-	//log
-	public static final String LOG_TAG = "mark";
-	
     Handler h = new Handler();
-    
-       
     String lastGpsContactDateTime = "";
-    
-    
     boolean showLastXML = true;
     
 	@Override
 	public void onCreate() {
+		
 	}
 	
 	@Override
@@ -91,48 +88,92 @@ public class PandroidAgentListener extends Service {
 	}
 	
 	private void contact(){
-        Date date = new Date();
+			
+		Toast toast = Toast.makeText(getApplicationContext(),
+				    getString(R.string.loading),
+		       		Toast.LENGTH_SHORT);
+		toast.setGravity(Gravity.BOTTOM,0,0);
+		toast.show();
+		    
+		Date date = new Date();
         
-    	putSharedData("PANDROID_DATA", "contactError", "0", "integer");
-        putSharedData("PANDROID_DATA", "lastContact", Long.toString(date.getTime() / 1000), "long");
-        
-        // Keep lastXML sent if is not empty (empty means error sending it)
-        String lastXML = buildXML();
-        
-		String agentName = getSharedData("PANDROID_DATA", "agentName", Core.defaultAgentName, "string");
-
-		String destFileName = agentName + "." + System.currentTimeMillis() + ".data";
-		
-		writeFile(destFileName, lastXML);
-
-		String[] tentacleData = {
-				  "-a",
-				  getSharedData("PANDROID_DATA", "serverAddr", "", "string"),
-				  "-p",
-				  Core.defaultServerPort,
-				  "-v",
-				  "/data/data/pandroid.agent/files/" + destFileName
-	    		  };
-
-		int tentacleRet = new tentacle_client().tentacle_client(tentacleData);
-    	
-		// Deleting the file after send it
-		File file = new File("/data/data/pandroid.agent/files/" + destFileName);
-    	file.delete();
-		
-        if(tentacleRet == 0) {
-            putSharedData("PANDROID_DATA", "lastXML", lastXML, "string");
-            if (Core.helloSignal >= 1)
-            	Core.helloSignal = 0;
-            Core.updateConf(getApplicationContext());
-        }
-        else {
-        	putSharedData("PANDROID_DATA", "contactError", "1", "integer");
-        }
+    	putSharedData("PANDROID_DATA", "lastContact", Long.toString(date.getTime() / 1000), "long");
         
+        String lastXML = "";
+        new contactTask().execute(lastXML);
         updateValues();
-        
+		
 	}//end contact
+       
+        
+    private class contactTask extends AsyncTask<String, Void, Void>{
+        		
+        	@Override
+        	protected Void doInBackground(String...params) {  
+        			
+        	String lastXML = params[0];
+        	lastXML = buildXML();
+        	String destFileName = "";
+        	String agentName = getSharedData("PANDROID_DATA", "agentName", Core.defaultAgentName, "string");
+        	destFileName = agentName + "." + System.currentTimeMillis() + ".data";
+        	
+        	writeFile(destFileName, lastXML);
+        	String[] tentacleData = {
+  				  "-a",
+  				  getSharedData("PANDROID_DATA", "serverAddr", "", "string"),
+  				  "-p",
+  				  Core.defaultServerPort,
+  				  "-v",
+  				  "/data/data/pandroid.agent/files/" + destFileName
+  	    		  };
+
+        	int tentacleRet = new tentacle_client().tentacle_client(tentacleData);
+        	
+        	putSharedData("PANDROID_DATA", "lastXML", lastXML, "string");	
+        	if(tentacleRet == 0) {
+        		putSharedData("PANDROID_DATA", "contactError", "0", "integer");
+        		// Deleting the file after send it
+        		// move to only delete if sent successfully
+        		File file = new File("/data/data/pandroid.agent/files/" + destFileName);
+        		file.delete();
+        		if (Core.helloSignal >= 1)
+        				Core.helloSignal = 0;
+        		Core.updateConf(getApplicationContext());
+           }
+           else{
+        	   putSharedData("PANDROID_DATA", "contactError", "1", "integer");
+           }
+        return null;
+        	
+        }//end doInBackground
+   }
+   
+    ////////////////////////////////////////////////////////////////////////////////////////
+    //  From unfinished task of buffering unsent xml files when no connection available   //
+    ////////////////////////////////////////////////////////////////////////////////////////
+    
+    /*
+	public boolean saveArray(String[] array, String arrayName, Context mContext) {   
+	    SharedPreferences prefs = mContext.getSharedPreferences("PANDROID_DATA", 0);  
+	    SharedPreferences.Editor editor = prefs.edit();  
+	    editor.putInt(arrayName +"_size", array.length);  
+	    for(int i=0;i<array.length;i++)  
+	        editor.putString(arrayName + "_" + i, array[i]);  
+	    return editor.commit();  
+	} 
+	
+	public String[] loadArray(String arrayName, Context mContext) {  
+	    SharedPreferences prefs = mContext.getSharedPreferences("PANDROID_DATA", 0);  
+	    int size = prefs.getInt(arrayName + "_size", 0);  
+	    String array[] = new String[size];  
+	    for(int i=0;i<size;i++)  
+	        array[i] = prefs.getString(arrayName + "_" + i, null);  
+	    return array;  
+	}  
+	*/
+	
+	////////////////////////////////////////////////////////////////////////////////////////
+	
 	
 	private String buildXML(){
 		String buffer = "";
@@ -149,17 +190,12 @@ public class PandroidAgentListener extends Service {
 		String agentName = getSharedData("PANDROID_DATA", "agentName", Core.defaultAgentName, "string");
 		String interval = getSharedData("PANDROID_DATA", "interval", Integer.toString(Core.defaultInterval), "integer");
 		
-
-		
-		
 		buffer += "<agent_data " +
-			"description='' group='' os_name='android' os_version='"+Build.VERSION.RELEASE+"' " +		//change to read real version of os
+			"description='' group='' os_name='android' os_version='"+Build.VERSION.RELEASE+"' " +		
 			"interval='"+ interval +"' version='4.0(Build 111012)' " + 
 			"timestamp='" + getHumanDateTime(-1) + "' agent_name='" + agentName + "' " +
 			"timezone_offset='0'" + gpsData +">\n";
 		
-		
-		
 		// 																					//
 		//									MODULES											//
 		//																					//
@@ -231,7 +267,6 @@ public class PandroidAgentListener extends Service {
 			}
 		}
 		
-		
 		if (memoryStatus.equals("enabled")) {
 			
 			Float freeMemory = new Float((Float.valueOf(availableRamKb) / Float.valueOf(totalRamKb)) * 100.0);
@@ -240,13 +275,13 @@ public class PandroidAgentListener extends Service {
 			buffer += buildmoduleXML("freeRamMemory", "The percentage of available ram.", "generic_data",
 				formatPercent.format(freeMemory.doubleValue()));
 		}
-		//buffer += buildmoduleXML("last_gps_contact", "Datetime of the last geo-location contact", "generic_data", lastGpsContactDateTime);
+		buffer += buildmoduleXML("last_gps_contact", "Datetime of the last geo-location contact", "generic_data", lastGpsContactDateTime);
+		if (DeviceUpTimeReport.equals("enabled"))
+			buffer += buildmoduleXML("upTime","Total device uptime in seconds.", "generic_data", upTime);
 		
 		if (Core.hasSim){
 			if (SimIDReport.equals("enabled"))
 				buffer += buildmoduleXML("simID", "The Sim ID.", "generic_data_string", SimID);
-			if (DeviceUpTimeReport.equals("enabled"))
-				buffer += buildmoduleXML("upTime","Total device uptime in seconds.", "generic_data", upTime);
 			if (NetworkOperatorReport.equals("enabled"))
 				buffer += buildmoduleXML("networkOperator","Currently registered network operator", "generic_data_string", networkOperator);
 			if (NetworkTypeReport.equals("enabled"))
@@ -274,11 +309,15 @@ public class PandroidAgentListener extends Service {
 		}// end if sim card
 		if (HelloSignalReport.equals("enabled"))
 			buffer += buildmoduleXML("helloSignal","Hello Signal", "generic_data", helloSignal);
+		
+		buffer += buildInventoryXML();
+		
 		// End_Modules
 		
 		buffer += "</agent_data>";
 		
 		return buffer;
+		
 	}// end buildXML
 	
     private void writeFile(String fileName, String textToWrite) {
@@ -309,7 +348,40 @@ public class PandroidAgentListener extends Service {
 		return buffer;
 	}
 	
-    private void gpsLocation() {
+	 
+	
+	private String buildInventoryXML(){
+		
+		String module_xml = "";
+		
+		module_xml += "\t<inventory>\n";
+		module_xml += "\t\t<inventory_module>\n\t\t\t<name><![CDATA[";
+		module_xml += "Software";
+		module_xml += "]]></name>\n";
+		module_xml += "\t\t\t<datalist>\n";
+		    
+		List<PackageInfo> packs = getPackageManager().getInstalledPackages(0);
+		for(int i=0;i<packs.size();i++) {
+		      module_xml += "\t\t\t\t<data><![CDATA[";
+		      
+		      PackageInfo p = packs.get(i);
+		           		            
+		      module_xml += p.applicationInfo.loadLabel(getPackageManager()).toString();
+		      module_xml += ";"+ p.versionName;
+		      module_xml += ";"+ p.packageName;
+		      module_xml += "]]></data>\n";
+		}
+		
+		/* Close the datalist and module_inventory */
+		module_xml += "\t\t\t</datalist>\n\t\t</inventory_module>\n";
+		/* Close inventory */
+		module_xml += "\t</inventory>\n";
+		//Log.d(LOG_TAG,module_xml);
+		        
+		return module_xml;
+	}
+	
+	private void gpsLocation() {
     	// Starts with GPS, if no GPS then gets network location
     	
 		LocationManager lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE);  
@@ -366,24 +438,14 @@ public class PandroidAgentListener extends Service {
     }
     
     private void batteryLevel() {
-        BroadcastReceiver batteryLevelReceiver = new BroadcastReceiver() {
-            public void onReceive(Context context, Intent intent) {
-            	try {
-            		context.unregisterReceiver(this);
-            	}
-            	catch (IllegalArgumentException e) {
-            		//None
-            	}
-                
-                int rawlevel = intent.getIntExtra("level", -1);
-                int scale = intent.getIntExtra("scale", -1);
-                if (rawlevel >= 0 && scale > 0) {
-                    putSharedData("PANDROID_DATA", "batteryLevel", Integer.valueOf((rawlevel * 100) / scale).toString(), "integer");
-                }
-            }
-        };
-        IntentFilter batteryLevelFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
-        registerReceiver(batteryLevelReceiver, batteryLevelFilter);
+    	
+    	Intent batteryIntent = getApplicationContext().registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+    		int rawlevel = batteryIntent.getIntExtra("level", -1);
+    		int scale = batteryIntent.getIntExtra("scale", -1);
+    		//double level = -1;
+    		if (rawlevel >= 0 && scale > 0) {
+    			putSharedData("PANDROID_DATA", "batteryLevel", Integer.valueOf((rawlevel * 100) / scale).toString(), "integer");
+    		}
     }
     
     /*private void sensors() {
@@ -465,7 +527,7 @@ public class PandroidAgentListener extends Service {
         getTaskStatus();
         getMemoryStatus();
         getUpTime();
-        //Ignore unnecessary modules
+        
         if(Core.hasSim)
         {
         	getSimID();
@@ -539,7 +601,7 @@ public class PandroidAgentListener extends Service {
 	/**
 	 * 	Retrieves the simID of the device if available
 	 */
-	public void getSimID(){
+	private void getSimID(){
 		
 			String simID = getSharedData("PANDROID_DATA", "simID", Core.defaultSimID, "string");
 		
@@ -551,20 +613,17 @@ public class PandroidAgentListener extends Service {
 	/**
 	 * 	Retrieves the time in seconds since the device was switched on
 	 */
-	public void getUpTime(){
+	private void getUpTime(){
 		long upTime = Core.defaultUpTime;
-	
 		upTime = SystemClock.elapsedRealtime()/1000;
-		
 		if(upTime != 0)
 			putSharedData("PANDROID_DATA", "upTime", ""+upTime, "long");
 	}
 	/**
 	 * 	Retrieve currently registered network operator, i.e. vodafone, movistar, etc...
 	 */
-	public void getNetworkOperator(){
+	private void getNetworkOperator(){
 		String networkOperator = Core.defaultNetworkOperator;
-				
 		String serviceName = Context.TELEPHONY_SERVICE;
 	    TelephonyManager telephonyManager = (TelephonyManager) getApplicationContext().getSystemService(serviceName);
 		networkOperator = telephonyManager.getNetworkOperatorName();
@@ -575,16 +634,12 @@ public class PandroidAgentListener extends Service {
 	/**
 	 *  Retrieves the number of sent sms messages using the android messaging app only
 	 */
-	public void getSMSSent(){
+	private void getSMSSent(){
 		
 		String SMSSent = ""+Core.defaultSMSSent;
-		
 		SMSSent = getSharedData("PANDROID_DATA", "SMSSent", ""+Core.defaultSMSSent, "integer");
-		
 		Uri allMessages = Uri.parse("content://sms/sent");
-		
 		Cursor c = getContentResolver().query(allMessages, null, null, null, null);
-		
 		int totalMessages = 0;
 		
 		while (c.moveToNext()) 
@@ -593,7 +648,6 @@ public class PandroidAgentListener extends Service {
 		    long messageLength = messageBody.length();
 		    double numberOfMessages = messageLength / 160.0;
 		    double numberOfMessagesRoundedUp = Math.ceil(numberOfMessages);
-
 		    totalMessages = (int) (totalMessages + numberOfMessagesRoundedUp);
 		}
 		
@@ -605,16 +659,13 @@ public class PandroidAgentListener extends Service {
 			putSharedData("PANDROID_DATA", "SMSSent", SMSSent, "integer");
 		
 	}// end getSMSSent
-	
 	/**
 	 *  Retrieve the type of data network currently connected to, i.e. edge, gprs, etc...
 	 */
-	public void getNetworkType()
+	private void getNetworkType()
 	{
 		String networkType = Core.defaultNetworkType;
-		
 		TelephonyManager tM = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
-		
 		int nT = tM.getNetworkType();
 
 		switch (nT)
@@ -676,12 +727,10 @@ public class PandroidAgentListener extends Service {
 	/**
 	 *  Retrieve the type of mobile network currently conncected to, i.e. gms, cdma, etc...
 	 */
-	public void getPhoneType()
+	private void getPhoneType()
 	{
 		String phoneType = Core.defaultPhoneType;
-		
 		TelephonyManager tM = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
-		
 		int pT = tM.getPhoneType();
 
 		switch (pT)
@@ -706,13 +755,11 @@ public class PandroidAgentListener extends Service {
 	/**
 	 *  Retrieves the number of incoming, missed and outgoing calls
 	 */
-	public void getCalls()
+	private void getCalls()
 	{
 		Cursor c = getApplicationContext().getContentResolver().query(android.provider.CallLog.Calls.CONTENT_URI, null, null, null, null);
 		c.moveToFirst();
-		
 		int typeColumn = c.getColumnIndex(android.provider.CallLog.Calls.TYPE);
-		
 		int incoming = 0;
 		int outgoing = 0;
 		int missed = 0;
@@ -726,11 +773,9 @@ public class PandroidAgentListener extends Service {
                     	case android.provider.CallLog.Calls.INCOMING_TYPE:
                     		incoming++;
                     		break;
-
                     	case android.provider.CallLog.Calls.MISSED_TYPE:
                            	missed++;
                             break;
-
                     	case android.provider.CallLog.Calls.OUTGOING_TYPE:
                             outgoing++;
                             break;
@@ -741,17 +786,15 @@ public class PandroidAgentListener extends Service {
 			putSharedData("PANDROID_DATA", "incomingCalls", ""+incoming, "integer");
             putSharedData("PANDROID_DATA", "missedCalls", ""+missed, "integer");
             putSharedData("PANDROID_DATA", "outgoingCalls", ""+outgoing, "integer");
-
 		}
 	}// end getCalls
-	
 	/**
 	 *  Retrieves the current cell signal strength in dB
 	 */
-	public void getSignalStrength()
+	private void getSignalStrength()
 	{	
-		TelephonyManager 		telephone 	= 	(TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
-		signalListener 			phoneState 	= 	new signalListener();
+		TelephonyManager telephone 	= 	(TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
+		signalListener phoneState 	= 	new signalListener();
 		telephone.listen(phoneState ,PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
 	}
 	
@@ -761,25 +804,23 @@ public class PandroidAgentListener extends Service {
 		public void onSignalStrengthsChanged(SignalStrength signalStrength)
 		{
 			super.onSignalStrengthsChanged(signalStrength);
-			Log.v(LOG_TAG, "here");
 			String signalStrengthValue = ""+Core.defaultSignalStrength;
 			if (signalStrength.isGsm()) {
                 if (signalStrength.getGsmSignalStrength() != 99)
                     signalStrengthValue =""+ (signalStrength.getGsmSignalStrength() * 2 - 113);
                 else
                     signalStrengthValue =""+ (signalStrength.getGsmSignalStrength());
-            } else {
-                signalStrengthValue ="" + (signalStrength.getCdmaDbm());
+            }
+			else{
+               signalStrengthValue ="" + (signalStrength.getCdmaDbm());
             }
 			putSharedData("PANDROID_DATA", "signalStrength", signalStrengthValue, "integer");
 		}
-		
 	};
-	
 	/**
 	 *  Retrieves the number of sent/received bytes using the mobile network
 	 */
-	public void getDataBytes()
+	private void getDataBytes()
 	{
 		
 		long receiveBytes = TrafficStats.getMobileRxBytes();
@@ -790,10 +831,11 @@ public class PandroidAgentListener extends Service {
 			putSharedData("PANDROID_DATA", "receiveBytes", ""+receiveBytes, "long" );
 			putSharedData("PANDROID_DATA", "transmitBytes", ""+transmitBytes, "long" );
 		}
-			
 	}
-	
-	public void getRoaming()
+	/**
+	 * Retrieves whether the device is currently connected to a roaming network
+	 */
+	private void getRoaming()
 	{
 		TelephonyManager telephone 	= 	(TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
 		boolean roaming = telephone.isNetworkRoaming();
@@ -802,7 +844,6 @@ public class PandroidAgentListener extends Service {
 			putSharedData("PANDROID_DATA", "roaming", "1", "integer" );
 		else
 			putSharedData("PANDROID_DATA", "roaming", "0", "integer" );
-				
 	}
 	
 	
diff --git a/pandora_agents/android/src/pandroid/agent/PandroidAgentTentacle.java b/pandora_agents/android/src/pandroid/agent/PandroidAgentTentacle.java
index 8cf986508a..798be2180f 100755
--- a/pandora_agents/android/src/pandroid/agent/PandroidAgentTentacle.java
+++ b/pandora_agents/android/src/pandroid/agent/PandroidAgentTentacle.java
@@ -23,7 +23,6 @@ import java.io.InputStreamReader;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-
 class tentacle_client {
 
 	// Return 0 when success, -1 when error
diff --git a/pandora_agents/android/src/pandroid/agent/SMSBroadcastReceiver.java b/pandora_agents/android/src/pandroid/agent/SMSBroadcastReceiver.java
index 8da48418db..5c9e9777a9 100644
--- a/pandora_agents/android/src/pandroid/agent/SMSBroadcastReceiver.java
+++ b/pandora_agents/android/src/pandroid/agent/SMSBroadcastReceiver.java
@@ -36,18 +36,16 @@ import android.util.Log;
 	        			int defaultSMSReceived = 0;
 	        			int mode = Activity.MODE_PRIVATE;
 	        			
-	        						
 	        			SharedPreferences pref = context.getSharedPreferences("PANDROID_DATA", mode);
-	        			int a = pref.getInt("SMSReceived", defaultSMSReceived);
+	        			int sms = pref.getInt("SMSReceived", defaultSMSReceived);
 	        			
-	        			a++;
+	        			sms++;
 	        			
 	        			SharedPreferences.Editor editor = pref.edit();
-	        			editor.putInt("SMSReceived", a);
+	        			editor.putInt("SMSReceived", sms);
 	        			editor.commit();
 	        		
-	            
-                    }//end if
+	                }//end if
        
 	        }//end onRecieve
 }//end class
diff --git a/pandora_agents/android/src/pandroid/agent/Setup.java b/pandora_agents/android/src/pandroid/agent/Setup.java
index 5706852dc2..59e64bda3e 100644
--- a/pandora_agents/android/src/pandroid/agent/Setup.java
+++ b/pandora_agents/android/src/pandroid/agent/Setup.java
@@ -49,22 +49,14 @@ import android.widget.Toast;
 
 public class Setup extends Activity {
 	
-	//log
-	public static final String LOG_TAG = "mark";
-	
 	private HashMap<String, String> listProcesses;
 	
-	
-	/** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
         listProcesses = new HashMap<String, String>();
-        
         Core.loadConf(getApplicationContext());
-        
-        
     }
     
     public void onResume() {
@@ -75,35 +67,23 @@ public class Setup extends Activity {
         else
         	setContentView(R.layout.setupnosim);
         
-     	
-        loadViews();
-        
-		loadInBackgroundProcessInExecution();
-		
+     	loadViews();
+        loadInBackgroundProcessInExecution();
 		setButtonEvents();
        
         if(Core.password.equals(Core.defaultPassword))
         {
         	if(Core.passwordCheck.equals("enabled"))
         		passwordChoose();
-        	
-        }else{
-        	
+        }
+        else{
         	LayoutInflater inflater=(LayoutInflater)getSystemService(LAYOUT_INFLATER_SERVICE);
         	View view=inflater.inflate(R.layout.setup, null);
         	RelativeLayout setup = (RelativeLayout)view.findViewById(R.id.setup);
         	setContentView(setup);
         	setup.setVisibility(RelativeLayout.INVISIBLE);
-        	
-        	enterpass();
-        	
-        	
-            
+        	enterPass();
         }
-        
-        
-        
-        
     }
     
     //For options
@@ -126,12 +106,10 @@ public class Setup extends Activity {
             	startActivity(i);
             	break;
         }
-        
         return true;
     }
     
 	private void setButtonEvents() {
-        // Set update button events
         Button updateButton = (Button) findViewById(R.id.update);
         
         updateButton.setOnClickListener(new OnClickListener() {
@@ -151,44 +129,31 @@ public class Setup extends Activity {
             	       	Toast.LENGTH_SHORT);
             	    	toast.show();
         		}
-        		
         		Core.restartAgentListener(getApplicationContext());
         	}
-        	
-        	
         });
         
         Button passwordButton = (Button) findViewById(R.id.set_password);
-        
         passwordButton.setOnClickListener(new OnClickListener() {
         	public void onClick(View view) {
-        		
         		createPass();
-        		
         	}
-        	
-        	
         });
         
         Button webButton = (Button) findViewById(R.id.goToWebButton);
-        
         webButton.setOnClickListener(new OnClickListener() {
         	public void onClick(View view) {
-        		
-        		 Uri uri = Uri.parse(Core.webName);
+        		 getDataFromView();
+        		 Core.updateConf(getApplicationContext());
+        		 Uri uri = Uri.parse(Core.mobileWebURL);
         		 Intent intent = new Intent(Intent.ACTION_VIEW, uri);
         		 startActivity(intent);
-        		
         	}
-        	
-        	
         });
         
 	}// end setButtonEvents
     
-	
-	
-    private void loadInBackgroundProcessInExecution() {
+	private void loadInBackgroundProcessInExecution() {
     	new GetProcessInExecutionAsyncTask().execute();
     }
     
@@ -197,7 +162,6 @@ public class Setup extends Activity {
 		@Override
 		protected Void doInBackground(Void... params) {
 			getProcess();
-			
 			return null;
 		}
 		
@@ -224,11 +188,9 @@ public class Setup extends Activity {
 			}
 		}
 		
-		
 		@Override
 		protected void onPostExecute(Void unused)
 		{
-			
 			Spinner combo = (Spinner)findViewById(R.id.processes_combo);
 			ArrayList<String> listProcess = new ArrayList<String>(listProcesses.keySet());
 			ArrayList<String> listProcessHuman = new ArrayList<String>(listProcesses.values());
@@ -246,7 +208,7 @@ public class Setup extends Activity {
 		    	if (position == -1) {
 		    		listProcesses.put(Core.task, text);
 		    		
-		    		//The asociative array is reordened, and need to extract th subarrays again.
+		    		//The asociative array is reordened, and need to extract the sub arrays again.
 		    		listProcess = new ArrayList<String>(listProcesses.keySet());
 					listProcessHuman = new ArrayList<String>(listProcesses.values());
 		    		
@@ -254,8 +216,7 @@ public class Setup extends Activity {
 		    	}
 		    }
 		    
-			
-	    	ArrayAdapter<String> spinnerArrayAdapter = new ArrayAdapter<String>(getApplicationContext(),
+			ArrayAdapter<String> spinnerArrayAdapter = new ArrayAdapter<String>(getApplicationContext(),
 		    	android.R.layout.simple_spinner_item, listProcessHuman);
 		    combo.setAdapter(spinnerArrayAdapter);
 		    
@@ -265,10 +226,7 @@ public class Setup extends Activity {
 		    progressBar.setVisibility(ProgressBar.GONE);
 		    
 		    combo.setVisibility(Spinner.VISIBLE);
-		    
-		    /*CheckBox checkbox = (CheckBox)findViewById(R.id.checkTaskReport);
-		    checkbox.setEnabled(true);*/
-		    
+		    		    
 		    Button button = (Button)findViewById(R.id.update);
 		    button.setEnabled(true);
 		    
@@ -277,13 +235,9 @@ public class Setup extends Activity {
 		    
 		    button = (Button)findViewById(R.id.goToWebButton);
 		    button.setEnabled(true);
-		    
 		}
-       	
     }// end onPostExecute
 	
-
-
     private void getDataFromView() {
         // Init form values
 		EditText editText;
@@ -302,8 +256,8 @@ public class Setup extends Activity {
 		editText = (EditText) findViewById(R.id.agentNameInput);
 		Core.agentName = editText.getText().toString();
 		
-		editText = (EditText) findViewById(R.id.webNameInput);
-		Core.webName = editText.getText().toString();
+		editText = (EditText) findViewById(R.id.mobileWebURLInput);
+		Core.mobileWebURL = "http://"+editText.getText().toString();
         
         checkBox = (CheckBox) findViewById(R.id.checkGpsReport);
         if (checkBox.isChecked())
@@ -323,8 +277,6 @@ public class Setup extends Activity {
         else
         	Core.memoryStatus = "disabled";
         
-        
-        
         checkBox = (CheckBox) findViewById(R.id.checkTaskReport);
         if (checkBox.isChecked()) {
         	Core.taskStatus = "enabled";
@@ -379,7 +331,7 @@ public class Setup extends Activity {
         		Core.SignalStrengthReport = "enabled";
         	else
         		Core.SignalStrengthReport = "disabled";
-        
+        	        
         	checkBox = (CheckBox) findViewById(R.id.checkReceivedSMSReport);
         	if (checkBox.isChecked())
         		Core.ReceivedSMSReport = "enabled";
@@ -455,8 +407,8 @@ public class Setup extends Activity {
 		editText = (EditText) findViewById(R.id.agentNameInput);
 		editText.setText(Core.agentName);
 		
-		editText = (EditText) findViewById(R.id.webNameInput);
-		editText.setText(Core.webName);
+		editText = (EditText) findViewById(R.id.mobileWebURLInput);
+		editText.setText(Core.mobileWebURL);
         
         checkBox = (CheckBox) findViewById(R.id.checkGpsReport);
         checkBox.setChecked(Core.gpsStatus.equals("enabled"));
@@ -518,34 +470,23 @@ public class Setup extends Activity {
         checkBox = (CheckBox) findViewById(R.id.checkHelloSignalReport);
         checkBox.setChecked(Core.HelloSignalReport.equals("enabled"));
         
-        
-	}
+    }
 	
 	public void passwordChoose() {
-		//set up dialog
 		final Dialog dialog = new Dialog(this);
 		dialog.setContentView(R.layout.password_choose);
 		dialog.setTitle(getString(R.string.password_choose_text));
 		dialog.setCancelable(false);
 		
-		//CheckBox cB = (CheckBox) dialog.findViewById(R.id.password_checkbox);
-		
-		//cB.setChecked(Core.passwordCheck.equals("disabled"));
-        
-	
-		Button yes = (Button) dialog.findViewById(R.id.yes_button);
+        Button yes = (Button) dialog.findViewById(R.id.yes_button);
 		yes.setOnClickListener(new OnClickListener() {
 		@Override
 		   public void onClick(View v) {
-			Core.passwordCheck = "disabled";
-			Core.updateConf(getApplicationContext());
-			dialog.dismiss();
-			createPass();
-			
-		   			    
-		   } // end onClick
-		
-		
+				Core.passwordCheck = "disabled";
+				Core.updateConf(getApplicationContext());
+				dialog.dismiss();
+				createPass();
+			} // end onClick
 		});//end clickListener
 		
 		Button no = (Button) dialog.findViewById(R.id.no_button);
@@ -553,47 +494,32 @@ public class Setup extends Activity {
 		@Override
 		   public void onClick(View v) {
 			
-			CheckBox cB = (CheckBox) dialog.findViewById(R.id.password_checkbox);
-			if (cB.isChecked())
-	        	Core.passwordCheck = "disabled";
-	        else
-	        	Core.passwordCheck = "enabled";	
-			Core.updateConf(getApplicationContext());
-			//Log.v(LOG_TAG,"password check"+Core.passwordCheck);
-			dialog.dismiss();
-			
-		   			    
-		   } // end onClick
-
-
-	    });//end clickListener
-		
-		
-		//now that the dialog is set up, it's time to show it   
-
-		    dialog.show();
-		
-		
+				CheckBox cB = (CheckBox) dialog.findViewById(R.id.password_checkbox);
+				if (cB.isChecked())
+					Core.passwordCheck = "disabled";
+				else
+					Core.passwordCheck = "enabled";	
+				Core.updateConf(getApplicationContext());
+				dialog.dismiss();
+			} // end onClick
+		});//end clickListener
 		
+		dialog.show();
 	}
+	
 	public void createPass() {
-		//set up dialog
+		
 		final Dialog dialog = new Dialog(this);
 		dialog.setContentView(R.layout.password_create);
-		//dialog.setTitle(getString(R.string.password_set));
 		dialog.setCancelable(false);
 		dialog.getWindow().setSoftInputMode (WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-		//there are a lot of settings, for dialog, check them all out!
-
-		//set up text
+		
 		final EditText text = (EditText) dialog.findViewById(R.id.password_create_field);
 		text.setText("");
-		//set up text
+		
 		final EditText text2 = (EditText) dialog.findViewById(R.id.password_create_field_2);
 		text2.setText("");
 
-
-		//set up button
 		Button button = (Button) dialog.findViewById(R.id.password_create_button);
 		button.setOnClickListener(new OnClickListener() {
 		@Override
@@ -659,32 +585,25 @@ public class Setup extends Activity {
 		    }
 		   } // end onClick
 			
-
-
-	    });//end clickListener
+		});//end clickListener
 			
-		//now that the dialog is set up, it's time to show it   
-
-		    dialog.show();
+		dialog.show();
 
 	}// end createPass
 	
-	public void enterpass() {
-		//set up dialog
+	public void enterPass() {
+		
 		final Dialog dialog = new Dialog(this,android.R.style.Theme_Black_NoTitleBar_Fullscreen);
 		dialog.setContentView(R.layout.password_entry);
 		dialog.setTitle(getString(R.string.password_enter));
 		dialog.setCancelable(false);
 		dialog.getWindow().setSoftInputMode (WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
 		dialog.getWindow().setFlags(LayoutParams.FLAG_FULLSCREEN, LayoutParams.FLAG_FULLSCREEN);
-		//there are a lot of settings, for dialog, check them all out!
-
-		//set up text
+		
+		
 		final EditText text = (EditText) dialog.findViewById(R.id.password_entry_input);
 		text.setText("");
 		
-
-		//set up button
 		Button button = (Button) dialog.findViewById(R.id.password_entry_button);
 		button.setOnClickListener(new OnClickListener() {
 		@Override
@@ -692,8 +611,7 @@ public class Setup extends Activity {
 			
 			String password = text.getText().toString().trim();
 				
-			
-		    try
+			try
 		    {
 		        if(password.equals(Core.password))
 		        {
@@ -721,14 +639,11 @@ public class Setup extends Activity {
 			    		setButtonEvents();
 			        	setupnosim.setVisibility(RelativeLayout.VISIBLE);
 		            }
-		            	
-		            
 		        }
 		        else
 		        {
 		        	text.setError(getString(R.string.password_incorrect)); 
 		        }
-		      
 		    }
 		    catch(Exception x)
 		    {       
@@ -742,14 +657,12 @@ public class Setup extends Activity {
 		}
 		});
 		
-		//now that the dialog is set up, it's time to show it   
 		Button backButton = (Button) dialog.findViewById(R.id.password_back_button);
 		backButton.setOnClickListener(new OnClickListener() {
 		@Override
 		   public void onClick(View v) {
 				dialog.dismiss();
 				switchTabInActivity(0);
-			
 			}
 		});
 		   
@@ -765,5 +678,5 @@ public class Setup extends Activity {
         PandroidAgent ParentActivity;
         ParentActivity = (PandroidAgent) this.getParent();
         ParentActivity.switchTab(indexTabToSwitchTo);
-}
+	}
 }
diff --git a/pandora_agents/android/src/pandroid/agent/Status.java b/pandora_agents/android/src/pandroid/agent/Status.java
index e03a3ab256..7c7c8af1fb 100644
--- a/pandora_agents/android/src/pandroid/agent/Status.java
+++ b/pandora_agents/android/src/pandroid/agent/Status.java
@@ -30,12 +30,9 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
 
-//import android.util.Log;
-
 public class Status  extends Activity {
 	Handler h = new Handler();
-	public static final String LOG_TAG = "mark";
-	
+		
 	/** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -48,13 +45,7 @@ public class Status  extends Activity {
         Core.loadLastValues(getApplicationContext());
         showLastValues();
         updateLastContactInfo();
-        
-        //connect automatically
-        //Core.restartAgentListener(getApplicationContext());
-        setButtonEvents();
-        
-        
-        
+        //setButtonEvents();
     }
     
     public void onStart(){
@@ -66,8 +57,9 @@ public class Status  extends Activity {
         	public void run() {
         		Core.loadLastValues(getApplicationContext());
         		showLastValues();
-        		updateLastContactInfo();
         		       		
+        		updateLastContactInfo();
+        		
         		h.postDelayed(this, 1000);
         	}
         });
@@ -94,22 +86,19 @@ public class Status  extends Activity {
             	startActivity(i);
             	break;
         }
-        
         return true;
     }
     
+    
+    /*
 	private void updateLastXML() {
 		
 		TextView xml = (TextView) this.findViewById(R.id.xml);
-		
-		//Core.restartAgentListener(getApplicationContext());
-		
 		SharedPreferences agentPreferences = getSharedPreferences(
     			getString(R.string.const_string_preferences),
     			Activity.MODE_PRIVATE);
 		
 		String lastXML = agentPreferences.getString("lastXML", "[no data]");
-		
 		xml.setText("Last XML builded: \n\n" + lastXML);
 		
 	}
@@ -118,12 +107,13 @@ public class Status  extends Activity {
 		xml.setText("");
 	}
 	
+	*/
+	
 	private void updateLastContactInfo() {
 		long lastContact = Core.lastContact;
 		int contactError = Core.contactError;
 		boolean alarmEnabled = Core.alarmEnabled;
-
-        Date date = new Date();
+		Date date = new Date();
         long timestamp = date.getTime() / 1000;
         long timeAgo = -1;
         
@@ -132,8 +122,6 @@ public class Status  extends Activity {
 		lastContactInfo.setTextColor(Color.parseColor("#FF0000"));
 		lastContactInfo.setText(getString(R.string.loading));
         
-        
-        
         if(lastContact != -1){
             timeAgo = timestamp - lastContact;
         }
@@ -153,12 +141,11 @@ public class Status  extends Activity {
     		lastContactInfo.setText(getString(R.string.contact_stopped_str));
     	}
     	
-    	
     	else if(contactError == 1) {
         	lastContactInfo = (TextView) this.findViewById(R.id.lastContactInfo_label_str);
     		lastContactInfo.setTextColor(Color.parseColor("#FF0000"));
     		lastContactInfo.setText(getString(R.string.conctact_error_str));
-        	//stopAgentListener();
+        	
         }
     	else if(lastContact == -1) {
     		stringAgo = getString(R.string.never_str);
@@ -166,15 +153,16 @@ public class Status  extends Activity {
     	else if(timeAgo == 0) {
     		stringAgo = getString(R.string.now_str);
     	}
-    	else {
+    	else if(contactError == 0) {
         	stringAgo = timeAgo + " " + getString(R.string.seconds_str);
         	lastContactInfo = (TextView) this.findViewById(R.id.lastContactInfo_label_str);
     		lastContactInfo.setTextColor(Color.parseColor("#00FF00"));
     		lastContactInfo.setText(getString(R.string.last_contact_str) + stringAgo);
         }
-    		   
-	}//end updateLastContactInfo
+       
+    }//end updateLastContactInfo
 	
+	/* For debugging
 	private void setButtonEvents() {
         // Set update button events
         Button start = (Button) findViewById(R.id.start);
@@ -203,27 +191,13 @@ public class Status  extends Activity {
         
         start.setOnClickListener(new OnClickListener() {
         	public void onClick(View view) {
-        		//boolean result = Core.updateConf(getApplicationContext());
-        		/*
-        		if (result) {
-        			Toast toast = Toast.makeText(getApplicationContext(),
-        	       		getString(R.string.config_saved),
-        	       		Toast.LENGTH_SHORT);
-        	    	toast.show();
-        		}
-        		else {
-        			Toast toast = Toast.makeText(getApplicationContext(),
-            	       	getString(R.string.incorrect_update),
-            	       	Toast.LENGTH_SHORT);
-            	    	toast.show();
-        		}
-        		*/
         		Core.restartAgentListener(getApplicationContext());
         	}
         });
         
     }//end button events
-	
+	*/
+    
 	private void showLastValues() {
 		
 		// latitude
@@ -267,10 +241,10 @@ public class Status  extends Activity {
 		if (Core.taskStatus.equals("enabled") && Core.taskHumanName.length() != 0) {
 			String text = Core.taskHumanName + " ( " + Core.task + " ): ";
 			if (Core.taskRun.equals("true")) {
-				text = text + "running";
+				text = text + getString(R.string.running);
 			}
 			else {
-				text = text + "not running";
+				text = text + getString(R.string.stopped);
 			}
 			textView.setText(text);		
 		}
@@ -288,10 +262,10 @@ public class Status  extends Activity {
 		textView = (TextView)findViewById(R.id.uptime_value);
 		textView.setText("");
 		if (Core.upTime != 0) {
-			textView.setText("" + Core.upTime+" Seconds");
+			textView.setText("" + Core.upTime+" "+ getString(R.string.seconds));
 		}
 		//  simID
-		//Log.v(LOG_TAG, "HERE: "+Core.hasSim);
+		
 		if (Core.hasSim) {
 			textView = (TextView)findViewById(R.id.sim_id_value);
 			textView.setText("");
@@ -317,35 +291,43 @@ public class Status  extends Activity {
 			textView = (TextView)findViewById(R.id.network_type_value);
 			textView.setText("");
 			textView.setText("" + Core.networkType);
-		
+			
+			// phoneType
 			textView = (TextView)findViewById(R.id.phone_type_value);
 			textView.setText("");
 			textView.setText("" + Core.phoneType);
-		
+			
+			// signalStrength
 			textView = (TextView)findViewById(R.id.signal_strength_value);
 			textView.setText("");
 			textView.setText("" + Core.signalStrength+"dB");
-		
+			
+			//incomingCalls
 			textView = (TextView)findViewById(R.id.incoming_calls_value);
 			textView.setText("");
 			textView.setText("" + Core.incomingCalls);
 		
+			//missedCalls
 			textView = (TextView)findViewById(R.id.missed_calls_value);
 			textView.setText("");
 			textView.setText("" + Core.missedCalls);
 
+			// outgoingCalls
 			textView = (TextView)findViewById(R.id.outgoing_calls_value);
 			textView.setText("");
 			textView.setText("" + Core.outgoingCalls);
 		
+			// receiveBytes
 			textView = (TextView)findViewById(R.id.receive_bytes_value);
 			textView.setText("");
 			textView.setText("" + Core.receiveBytes);
 		
+			// transmiteBytes
 			textView = (TextView)findViewById(R.id.transmit_bytes_value);
 			textView.setText("");
 			textView.setText("" + Core.transmitBytes);
 			
+			// roaming
 			textView = (TextView)findViewById(R.id.roaming_value);
 			textView.setText("");
 			textView.setText("" + Core.roaming);