Replaced all single strings with localized resources.

BUG=270362
NOTRY=true

Review URL: https://codereview.chromium.org/185853005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255080 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 17 insertions, 20 deletions

diff --git a/remoting/android/java/src/org/chromium/chromoting/Chromoting.java b/remoting/android/java/src/org/chromium/chromoting/Chromoting.java
index 9632de2..148ff58b 100644
--- a/remoting/android/java/src/org/chromium/chromoting/Chromoting.java
+++ b/remoting/android/java/src/org/chromium/chromoting/Chromoting.java
@@ -255,15 +255,17 @@ public class Chromoting extends Activity implements JniInterface.ConnectionListe
 
             mHostListLoader.retrieveHostList(authToken, this);
         } catch (OperationCanceledException ex) {
-            explanation = getString(R.string.error_auth_canceled);
+            // User canceled authentication. No need to report an error.
         } catch (AuthenticatorException ex) {
-            explanation = getString(R.string.error_no_accounts);
+            explanation = getString(R.string.error_unexpected);
         } catch (IOException ex) {
-            explanation = getString(R.string.error_bad_connection);
+            explanation = getString(R.string.error_network_error);
         }
 
         if (result == null) {
-            Toast.makeText(this, explanation, Toast.LENGTH_LONG).show();
+            if (explanation != null) {
+                Toast.makeText(this, explanation, Toast.LENGTH_LONG).show();
+            }
             return;
         }
 
@@ -301,14 +303,12 @@ public class Chromoting extends Activity implements JniInterface.ConnectionListe
             case AUTH_FAILED:
                 break;
             case NETWORK_ERROR:
-                explanation = getString(R.string.error_bad_connection);
+                explanation = getString(R.string.error_network_error);
                 break;
-            case SERVICE_UNAVAILABLE:
             case UNEXPECTED_RESPONSE:
-                explanation = getString(R.string.error_unexpected_response);
-                break;
+            case SERVICE_UNAVAILABLE:
             case UNKNOWN:
-                explanation = getString(R.string.error_unknown);
+                explanation = getString(R.string.error_unexpected);
                 break;
             default:
                 // Unreachable.
@@ -338,7 +338,7 @@ public class Chromoting extends Activity implements JniInterface.ConnectionListe
         } else {
             // Authentication truly failed.
             Log.e("auth", "Fresh auth token was also rejected");
-            explanation = getString(R.string.error_auth_failed);
+            explanation = getString(R.string.error_authentication_failed);
             Toast.makeText(this, explanation, Toast.LENGTH_LONG).show();
         }
     }
@@ -350,12 +350,12 @@ public class Chromoting extends Activity implements JniInterface.ConnectionListe
         mRefreshButton.setEnabled(mAccount != null);
 
         if (mHosts == null) {
-            mGreeting.setText(getString(R.string.inst_empty_list));
+            mGreeting.setText(getString(R.string.host_list_empty_android));
             mList.setAdapter(null);
             return;
         }
 
-        mGreeting.setText(getString(R.string.inst_host_list));
+        mGreeting.setText(getString(R.string.mode_me2me));
 
         ArrayAdapter<HostInfo> displayer = new HostListAdapter(this, R.layout.host, mHosts);
         Log.i("hostlist", "About to populate host list display");
@@ -374,7 +374,7 @@ public class Chromoting extends Activity implements JniInterface.ConnectionListe
                 // The connection is still being established, so we'll report the current progress.
                 if (mProgressIndicator == null) {
                     mProgressIndicator = ProgressDialog.show(this,
-                            getString(R.string.progress_title), stateText, true, true,
+                            getString(R.string.footer_connecting), stateText, true, true,
                             new DialogInterface.OnCancelListener() {
                                 @Override
                                 public void onCancel(DialogInterface dialog) {
diff --git a/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java b/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
index 54ca0f2..cf4db0e 100644
--- a/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
+++ b/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
@@ -208,8 +208,8 @@ public class JniInterface {
     @CalledByNative
     private static void displayAuthenticationPrompt(boolean pairingSupported) {
         AlertDialog.Builder pinPrompt = new AlertDialog.Builder(sContext);
-        pinPrompt.setTitle(sContext.getString(R.string.pin_entry_title));
-        pinPrompt.setMessage(sContext.getString(R.string.pin_entry_message));
+        pinPrompt.setTitle(sContext.getString(R.string.title_authenticate));
+        pinPrompt.setMessage(sContext.getString(R.string.pin_message_android));
         pinPrompt.setIcon(android.R.drawable.ic_lock_lock);
 
         final View pinEntry = sContext.getLayoutInflater().inflate(R.layout.pin_dialog, null);
@@ -224,7 +224,7 @@ public class JniInterface {
         }
 
         pinPrompt.setPositiveButton(
-                R.string.pin_entry_connect, new DialogInterface.OnClickListener() {
+                R.string.connect_button, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         Log.i("jniiface", "User provided a PIN code");
@@ -234,13 +234,10 @@ public class JniInterface {
                 });
 
         pinPrompt.setNegativeButton(
-                R.string.pin_entry_cancel, new DialogInterface.OnClickListener() {
+                R.string.cancel, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         Log.i("jniiface", "User canceled pin entry prompt");
-                        Toast.makeText(sContext,
-                                sContext.getString(R.string.msg_pin_canceled),
-                                Toast.LENGTH_LONG).show();
                         disconnectFromHost();
                     }
                 });