diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index f40e2290c4..014583a6a2 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-31 Miguel de Dios <miguel.dedios@artica.es>
+
+ * android/src/pandroid/agent/PandroidAgentListener.java: fixed type of
+ memory module.
+
+ * android/res/values/strings.xml, android/res/values-en/strings.xml,
+ android/res/values-es/strings.xml: rewrote the help text for to erase the
+ references to proximity module.
+
2011-10-29 Junichi Satoh <junichi@rworks.jp>
* android/res/values-ja/strings.xml: Updated the help text.
diff --git a/pandora_agents/android/res/values-en/strings.xml b/pandora_agents/android/res/values-en/strings.xml
index 27dc215a89..e7b99df5da 100755
--- a/pandora_agents/android/res/values-en/strings.xml
+++ b/pandora_agents/android/res/values-en/strings.xml
@@ -46,6 +46,6 @@
<string name="last_contact_str">Last Contact:\n</string>
<string name="help_text_str">
Pandroid Agent is an Android Pandora FMS agent for Pandora FMS. <p>
- Pandora FMS is a general purpose monitoring system. With android agent you can get GPS information of your device, know how much battery left, memory on device, or using the proximity sensor to know if the phone is near your ear :-). This could be expanded in the future to report if a given process is running, very useful to use the agent on embedded devices on tablets to report to a central server. Also can be expanded to get information given by the user for other app and stored in the device or doing a lot of things more. Complete source code is provided.<p>See more about Pandora FMS at <a href="http://pandorafms.org">http://pandorafms.org</a></p>
+ Pandora FMS is a general purpose monitoring system. With android agent you can get GPS information of your device, know how much battery left, memory on device. This could be expanded in the future to report if a given process is running, very useful to use the agent on embedded devices on tablets to report to a central server. Also can be expanded to get information given by the user for other app and stored in the device or doing a lot of things more. Complete source code is provided.<p>See more about Pandora FMS at <a href="http://pandorafms.org">http://pandorafms.org</a></p>
</string>
</resources>
diff --git a/pandora_agents/android/res/values-es/strings.xml b/pandora_agents/android/res/values-es/strings.xml
index 3e1cc580cb..46f0374e0a 100755
--- a/pandora_agents/android/res/values-es/strings.xml
+++ b/pandora_agents/android/res/values-es/strings.xml
@@ -46,6 +46,6 @@
<string name="last_contact_str">Último contacto:\n</string>
<string name="help_text_str">
Pandroid Agent es un agente en Android para Pandora FMS. <p>
- Pandora FMS es un sistema de monitorización de propósito general. Con el agente en Android puedes monitorizar GPS, cuanta batería le queda al dispositivo, memoria disponible o conocer con el sensor de proximidad si tienes el movil en tu oreja :-). 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.<p>Puedes informarte de esto y mas en Pandora FMS en <a href="http://pandorafms.org">http://pandorafms.org</a></p>
+ Pandora FMS es un sistema de monitorización de propó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.<p>Puedes informarte de esto y mas en Pandora FMS en <a href="http://pandorafms.org">http://pandorafms.org</a></p>
</string>
</resources>
diff --git a/pandora_agents/android/res/values/strings.xml b/pandora_agents/android/res/values/strings.xml
index 27dc215a89..e7b99df5da 100755
--- a/pandora_agents/android/res/values/strings.xml
+++ b/pandora_agents/android/res/values/strings.xml
@@ -46,6 +46,6 @@
<string name="last_contact_str">Last Contact:\n</string>
<string name="help_text_str">
Pandroid Agent is an Android Pandora FMS agent for Pandora FMS. <p>
- Pandora FMS is a general purpose monitoring system. With android agent you can get GPS information of your device, know how much battery left, memory on device, or using the proximity sensor to know if the phone is near your ear :-). This could be expanded in the future to report if a given process is running, very useful to use the agent on embedded devices on tablets to report to a central server. Also can be expanded to get information given by the user for other app and stored in the device or doing a lot of things more. Complete source code is provided.<p>See more about Pandora FMS at <a href="http://pandorafms.org">http://pandorafms.org</a></p>
+ Pandora FMS is a general purpose monitoring system. With android agent you can get GPS information of your device, know how much battery left, memory on device. This could be expanded in the future to report if a given process is running, very useful to use the agent on embedded devices on tablets to report to a central server. Also can be expanded to get information given by the user for other app and stored in the device or doing a lot of things more. Complete source code is provided.<p>See more about Pandora FMS at <a href="http://pandorafms.org">http://pandorafms.org</a></p>
</string>
</resources>
diff --git a/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java b/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
index 0411009e7b..1503bac39c 100644
--- a/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
+++ b/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
@@ -197,7 +197,7 @@ public class PandroidAgentListener extends Service {
Float freeMemory = new Float((Float.valueOf(availableRamKb) / Float.valueOf(totalRamKb)) * 100.0);
DecimalFormat formatPercent = new DecimalFormat("#.##");
- buffer += buildmoduleXML("freeRamMemory", "The available ram in percent value.", "async_data",
+ buffer += buildmoduleXML("freeRamMemory", "The available ram in percent value.", "generic_data",
formatPercent.format(freeMemory.doubleValue()));
}
//buffer += buildmoduleXML("last_gps_contact", "Datetime of the last geo-location contact", "generic_data", lastGpsContactDateTime);