Fix string translation issues in SipEditor.

Change-Id: I7f0ed50e1f130680183054f3704c0dc218a00bec
http://b/issue?id=2988154
diff --git a/res/values/strings.xml b/res/values/strings.xml
index abd9d29..972db47 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1328,18 +1328,20 @@
     <string name="display_name_summary">&lt;Same as username&gt;</string>
     <!-- Default value for the outbound-proxy-address preference summary. [CHAR LIMIT=NONE] -->
     <string name="optional_summary">&lt;Optional&gt;</string>
-    <!-- Default sip server/proxy port number. [CHAR LIMIT=NONE] -->
-    <string name="default_port">5060</string>
-    <!-- Default sip server/proxy transport protocol. [CHAR LIMIT=NONE] -->
-    <string name="default_transport">UDP</string>
+
+    <!-- Default sip server/proxy port number. -->
+    <string translatable="false" name="default_port">5060</string>
+    <!-- Default sip server/proxy transport protocol. -->
+    <string translatable="false" name="default_transport">UDP</string>
+
 
     <!-- Hint to show the advanced settings section. [CHAR LIMIT=NONE] -->
     <string name="advanced_settings_show">▷ Select to show all</string>
     <!-- Hint to hide the advanced settings section. [CHAR LIMIT=NONE] -->
     <string name="advanced_settings_hide">▽ Select to hide all</string>
 
-    <!-- String to be appended to indicate some preference field can not be empty in the alert dialog. [CHAR LIMIT=NONE] -->
-    <string name="empty_alert"> cannot be empty</string>
+    <!-- Showing that some preference field can not be empty in an alert dialog. [CHAR LIMIT=NONE] -->
+    <string name="empty_alert">%s cannot be empty</string>
 
     <!-- Do not translate the following strings. Used for the Internet call options. Need to be in-sync with Settings.System.SIP_ strings. -->
     <string translatable="false" name="sip_always">SIP_ALWAYS</string>
diff --git a/src/com/android/phone/sip/SipEditor.java b/src/com/android/phone/sip/SipEditor.java
index 7ef7943..285173e 100644
--- a/src/com/android/phone/sip/SipEditor.java
+++ b/src/com/android/phone/sip/SipEditor.java
@@ -201,8 +201,7 @@
 
                 String value = ((EditTextPreference) pref).getText();
                 if (TextUtils.isEmpty(value)) {
-                    showAlert(pref.getTitle() + " "
-                            + getString(R.string.empty_alert));
+                    showAlert(getString(R.string.empty_alert, pref.getTitle()));
                     return false;
                 }
             }