From 211f673bdf8865dc9ef8fa408add572698570ff5 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 28 Oct 2011 10:12:23 +0000 Subject: [PATCH] 2011-10-28 Miguel de Dios * android/AndroidManifest.xml: updated the number of version. * android/res/values/strings.xml, android/res/values-en/strings.xml, android/res/values-es/strings.xml: added the help text in other languages. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5096 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/ChangeLog | 7 +++++++ pandora_agents/android/AndroidManifest.xml | 4 ++-- pandora_agents/android/res/values-en/strings.xml | 3 ++- pandora_agents/android/res/values-es/strings.xml | 3 ++- pandora_agents/android/res/values/strings.xml | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index 332aca1b06..161139d1d0 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,3 +1,10 @@ +2011-10-28 Miguel de Dios + + * android/AndroidManifest.xml: updated the number of version. + + * android/res/values/strings.xml, android/res/values-en/strings.xml, + android/res/values-es/strings.xml: added the help text in other languages. + 2011-10-27 Sancho Lerena * res/values/strings.xml: Default string for "help" screen. diff --git a/pandora_agents/android/AndroidManifest.xml b/pandora_agents/android/AndroidManifest.xml index d22fa358c3..2477f085c9 100755 --- a/pandora_agents/android/AndroidManifest.xml +++ b/pandora_agents/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="2" + android:versionName="1.5"> Contact error Last Contact:\n - <p>Un texto</p><p>Otro texto<br/><a href="http://google.es">google</a> el <i>texto</i></p> + 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> diff --git a/pandora_agents/android/res/values-es/strings.xml b/pandora_agents/android/res/values-es/strings.xml index d0f77a8629..3e1cc580cb 100755 --- a/pandora_agents/android/res/values-es/strings.xml +++ b/pandora_agents/android/res/values-es/strings.xml @@ -45,6 +45,7 @@ Error contacto Último contacto:\n - <p>Un texto</p><p>Otro texto<br/><a href="http://google.es">google</a> el <i>texto</i></p> + 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> diff --git a/pandora_agents/android/res/values/strings.xml b/pandora_agents/android/res/values/strings.xml index f1882a767f..27dc215a89 100755 --- a/pandora_agents/android/res/values/strings.xml +++ b/pandora_agents/android/res/values/strings.xml @@ -46,6 +46,6 @@ Last Contact:\n 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. See more about Pandora FMS at <a href='http://pandorafms.org'>http://pandorafms.org</A> + 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>