Add SH and ROOTSH commands

[fonbot.git] / res / values / strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8b4dd013bf6721e201915c78780816e7fb168822..f72cfd0b40a9dabd744d6126bccb1e0581c92e7b 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,21 +1,22 @@
 <resources>
     <string name="app_name">FonBot</string>
     <string name="send_message_permission_desc">Allows an application to send notifications through FonBot</string>
-    <string name="help">Initial setup:\n
+    <string name="help"><h1>1. Initial setup:</h1>\n
 <ol>
        <li><a href="http://auth.ieval.ro">Register an account</a>\n</li>
        <li>Enter your username and password in the <a href="ro.ieval.fonbot.FonBotPreferenceActivity://">preferences</a>\n\n</li>
 </ol>
 
-Sending commands:\n
+<h1>2. Sending commands:</h1>\n
 <ul>
-    <li>via Jabber: Send commands to fonbot@ieval.ro from any Jabber/GTalk account\n</li>
-    <li>via Yahoo Messenger: Send commands to fonbotym\n</li>
+    <li>via Jabber: Login by sending "login YOUR_USRENAME YOUR_PASSWORD" to fonbot@ieval.ro, then send commands\n</li>
+    <li>via Yahoo Messenger: Login by sending "login YOUR_USRENAME YOUR_PASSWORD" to fonbotym, then send commands\n</li>
+    <li>via IRC: Login by sending "login YOUR_USERNAME YOUR_PASSWORD" to fonbot on OFTC, then send commands\n</li>
     <li>via SMS: Set a SMS Password in the <a href="ro.ieval.fonbot.FonBotPreferenceActivity://">preferences</a>, then send SMSes with the SMS Password as the first line. The next lines will be processed as commands\n</li>
-    <li>via email: Send commands to fonbot@ieval.ro\n</li>
 </ul>
 \nFonBot commands consist of a command name and zero or more arguments, separated by spaces. To include spaces in an argument, surround the argument with single or double quotes.\n\n
 Example command: sms 0755555555 \'This is a random text\'. This command would send a text message to 0755555555\n\n
+
 The help command can be used to get a list of commands and help for them. Examples:\n\n
 <ul>
     <li>help — shows a list of commands\n</li>
@@ -145,11 +146,9 @@ The help command can be used to get a list of commands and help for them. Exampl
     <string name="wifi_off">Wifi: off</string>
     <string name="enabling_wifi">Enabling wifi…</string>
     <string name="disabling_wifi">Disabling wifi…</string>
-    <string name="polling_server">Polling server…</string>
-    <string name="polling_stopped">Polling stopped</string>
+    <string name="starting_long_polling_if_stopped">Starting long polling if stopped…</string>
     <string name="command_disabled">Command %s disabled</string>
     <string name="command_enabled">Command %s enabled</string>
-    <string name="polling_every_milliseconds">Polling every %d milliseconds</string>
     <string name="incoming_message">Incoming message from %1$s: \"%2$s\" sent at %3$s</string>
     <string name="outgoing_message">Outgoing message to %1$s: \"%2$s\" sent at %3$s</string>
     <string name="error_writing_to_socket">Error writing to socket: %s</string>
@@ -196,10 +195,9 @@ The help command can be used to get a list of commands and help for them. Exampl
                Example: wipe data
     </string>
     <string name="poll_help">
-        Usage: poll [ms]\n
-               With no arguments, polls the server once\n
-               With an argument, starts polling the server every &lt;ms&gt; milliseconds. If &lt;ms&gt; is 0, the polling is stopped\n
-               Example: poll 60000
+        Usage: poll\n
+               Starts the long polling service if it is stopped\n
+               Example: poll
     </string>
     <string name="contacts_help">
         Usage: contacts substring\n
@@ -438,7 +436,6 @@ The help command can be used to get a list of commands and help for them. Exampl
         Example: shutdown
     </string>
     <string name="location_tracking_is_active">Location tracking is active</string>
-    <string name="the_polling_service_is_running">The polling service is running</string>
     <string name="cancel">Cancel</string>
     <string name="command_sent">Command sent</string>
     <string name="could_not_parse_id">Could not parse id</string>
@@ -473,4 +470,15 @@ The help command can be used to get a list of commands and help for them. Exampl
        </string>
        <string name="error_opening_file">Error opening file %1$s (%2$s)</string>
        <string name="file_received">File received</string>
+       <string name="reboot_failed">Reboot failed</string>
+       <string name="sh_help">
+         Usage: sh command [arg1 arg2 ...]\n
+         Executes a shell command and returns its output. FonBot waits for the command to finish, therefore this must not be used with long-running commands.\n
+         Example: sh ls /sdcard/
+       </string>
+       <string name="rootsh_help">
+         Usage: rootsh command [arg1 arg2 ...]\n
+         Executes a shell command as root and returns its output. FonBot waits for the command to finish, therefore this must not be used with long-running commands. This requires root access.\n
+         Example: rootsh stop;sleep 3;start
+       </string>
 </resources>