Clean up sendMessage calls

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e49e617de03bd05160e08d111cbb3a69ea3fe3aa..602040c1a76730ab541271cb6165cf4f5c25aa79 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,6 +26,7 @@ The help command can be used to get a list of commands and help for them. Exampl
     <string name="user_tapped_fmt">User tapped \'%s\'</string>
     <string name="user_navigated_away_from_dialog">User navigated away from dialog</string>
     <string name="user_canceled_dialog">User canceled dialog</string>
+    <string name="admin_disabled">Admin disabled</string>
     <string name="admin_disable_requested">Admin disable requested</string>
     <string name="admin_enabled">Admin enabled</string>
     <string name="device_password_changed">Device password changed</string>
@@ -33,7 +34,7 @@ The help command can be used to get a list of commands and help for them. Exampl
     <string name="device_login_succeeded">Device login succeeded</string>
     <string name="logging_in">Logging in…</string>
     <string name="phone_status_idle">Phone is now idle</string>
-    <string name="phone_status_ringing">"Phone is ringing. Incoming number: "</string>
+    <string name="phone_status_ringing">"Phone is ringing. Incoming number: %s"</string>
     <string name="phone_status_offhook">Phone is offhook</string>
     <string name="location">Location</string>
     <string name="latitude">Latitude</string>
@@ -146,11 +147,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>
@@ -197,10 +196,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
@@ -219,9 +217,14 @@ The help command can be used to get a list of commands and help for them. Exampl
     </string>
     <string name="sms_help">
         Usage: sms phone_number message\n
-               Sends an sms with text &lt;message&gt; to &lt;phone_number&gt;.\n
+               Sends an sms with text &lt;message&gt; to &lt;phone_number&gt;. This command requests a delivery report. If you do not want one, use the SMSQ command.\n
                Example: sms 0755555555 \"Test message\"
     </string>
+    <string name="smsq_help">
+        Usage: smsq phone_number message\n
+               Sends an sms with text &lt;message&gt; to &lt;phone_number&gt;. This command does not request a delivery report. If you want one, use the SMS command.\n
+               Example: smsq 0755555555 \"Test message\"
+    </string>
     <string name="setpassword_help">
         Usage: setpassword [password]\n
                With no argument, clears the device password.\n
@@ -439,7 +442,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>
@@ -474,4 +476,23 @@ 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>
+       <string name="command_not_documented">This command is not documented (yet).</string>
+       <string name="sms_sent">SMS sent (%s)</string>
+       <string name="sms_not_sent_generic_failure">SMS not sent: Generic failure (%s)</string>
+       <string name="sms_not_sent_no_service">SMS not sent: No service (%s)</string>
+       <string name="sms_not_sent_null_pdu">SMS not sent: Null PDU (%s)</string>
+       <string name="sms_not_sent_radio_off">SMS not sent: Radio off (%s)</string>
+       <string name="sms_delivered">SMS delivered (%s)</string>
+       <string name="sms_not_delivered">SMS not delivered (%s)</string>
 </resources>