Revert "Superuser: Don't duplicate 'Allow' string"

On a second thought, this is plain confusing for translators.
I'd like to keep the ~350 people who translate happy.

This reverts commit 6af4772b0172cb3e0b70f2ab5b961139f404e621.

Change-Id: I6b1a82ed3292aa98b0d340d6dd9e90de8791b05d

diff --git a/Superuser/res/values/strings.xml b/Superuser/res/values/strings.xml
index 5f39ff9..18ef309 100644 (file)
--- a/Superuser/res/values/strings.xml
+++ b/Superuser/res/values/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="superuser">Superuser</string>
     <string name="allow">Allow</string>
-    <string name="allow_countdown">%1$s (%2$s)</string>
+    <string name="allow_countdown">Allow (%1$s)</string>
     <string name="deny">Deny</string>
     <string name="status_incoming">Incoming Superuser Request\u2026</string>
     <string name="unknown_uid">Unknown UID: %s</string>

diff --git a/Superuser/src/com/koushikdutta/superuser/MultitaskSuRequestActivity.java b/Superuser/src/com/koushikdutta/superuser/MultitaskSuRequestActivity.java
index 704e2bd..d7d6088 100644 (file)
--- a/Superuser/src/com/koushikdutta/superuser/MultitaskSuRequestActivity.java
+++ b/Superuser/src/com/koushikdutta/superuser/MultitaskSuRequestActivity.java
@@ -269,10 +269,9 @@ public class MultitaskSuRequestActivity extends FragmentActivity {
 
         new Runnable() {
             public void run() {
-                String allow = getString(R.string.allow);
-                mAllow.setText(getString(R.string.allow_countdown, allow, mTimeLeft));
+                mAllow.setText(getString(R.string.allow_countdown, mTimeLeft));
                 if (mTimeLeft-- <= 0) {
-                    mAllow.setText(allow);
+                    mAllow.setText(getString(R.string.allow));
                     if (!mHandled)
                         mAllow.setEnabled(true);
                     return;