X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=res%2Fvalues%2Fstrings.xml;h=b1253262f45982e23571d94e4413b3fdda6b3bcc;hb=6926b04deddff9e091ed1e7319fd20cd485d9f57;hp=3d8258e048b8f97bc2c37f9f90ff10ebc6f6afe8;hpb=b4f8b90cdb5353c6862235bb799c620e6865ac28;p=fonbot.git

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3d8258e..b125326 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9,8 +9,8 @@
 
 <h1>2. Sending commands:</h1>\n
 <ul>
-    <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 Jabber: Login by sending "login YOUR_USERNAME YOUR_PASSWORD" to fonbot@ieval.ro, then send commands\n</li>
+    <li>via Yahoo Messenger: Login by sending "login YOUR_USERNAME 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>
 </ul>
@@ -20,12 +20,13 @@ Example command: sms 0755555555 \'This is a random text\'. This command would se
 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>
-    <li>help sms — shows help for the ls comand</li>
+    <li>help sms — shows help for the sms comand</li>
 </ul>
 </string>
     <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>
@@ -216,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
@@ -253,7 +259,7 @@ The help command can be used to get a list of commands and help for them. Exampl
     </string>
     <string name="flash_help">
         Usage: flash on/off\n
-		Turns the flashlight on or off. This is unreliable. If you have the Torch app installed, use the torch command instead.\n
+		Turns the flashlight on or off. This is unreliable. If you have the Torch app installed, use the TORCH command instead.\n
 		Example: flash on
     </string>
     <string name="echo_help">
@@ -457,7 +463,7 @@ The help command can be used to get a list of commands and help for them. Exampl
 	</string>
 	<string name="torch_help">
 	  Usage: torch\n
-	  Toggles the torch (flashlight). This is reliable but requires the Torch app. If you don\'t have the Torch app installed, use the flash command instead.\n
+	  Toggles the torch (flashlight). This is reliable but requires the Torch app. If you don\'t have the Torch app installed, use the FLASH command instead.\n
 	  Example: torch
 	</string>
 	<string name="toggling_torch_state">Toggling torch state…</string>
@@ -482,4 +488,11 @@ The help command can be used to get a list of commands and help for them. Exampl
 	  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>